diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-11-12 22:12:25 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-12 22:15:04 -0500 |
| commit | e532b75e21bb7bcadd85496f0c090405c0f81e2b (patch) | |
| tree | 7b9184c90c0356eb7cdfbc8621c4a4e692966c1f | |
| parent | 6116a5d48f1a1d7fd4cd671659515fa9cf71a2b5 (diff) | |
| download | kutter-e532b75e21bb7bcadd85496f0c090405c0f81e2b.tar.gz kutter-e532b75e21bb7bcadd85496f0c090405c0f81e2b.tar.xz kutter-e532b75e21bb7bcadd85496f0c090405c0f81e2b.zip | |
mcu: Minor simplification to default reset detection
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/mcu.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index 4f045263..3cabac38 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -556,11 +556,9 @@ class MCU: self._emergency_stop_cmd = self.lookup_command("emergency_stop") self._reset_cmd = self.try_lookup_command("reset") self._config_reset_cmd = self.try_lookup_command("config_reset") - msgparser = self._serial.get_msgparser() - if (self._restart_method is None - and (self._reset_cmd is not None - or self._config_reset_cmd is not None) - and msgparser.get_constant('SERIAL_BAUD', None) is None): + ext_only = self._reset_cmd is None and self._config_reset_cmd is None + mbaud = self._serial.get_msgparser().get_constant('SERIAL_BAUD', None) + if self._restart_method is None and mbaud is None and not ext_only: self._restart_method = 'command' self.register_response(self._handle_shutdown, 'shutdown') self.register_response(self._handle_shutdown, 'is_shutdown') |