3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mcu: Minor simplification to default reset detection 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-11-12 22:12:25 -05:00
parent 6116a5d48f
commit e532b75e21
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
klippy/mcu.py
View File

@ -556,11 +556,9 @@ class MCU:
self._emergency_stop_cmd = self.lookup_command("emergency_stop") self._emergency_stop_cmd = self.lookup_command("emergency_stop")
self._reset_cmd = self.try_lookup_command("reset") self._reset_cmd = self.try_lookup_command("reset")
self._config_reset_cmd = self.try_lookup_command("config_reset") self._config_reset_cmd = self.try_lookup_command("config_reset")
msgparser = self._serial.get_msgparser() ext_only = self._reset_cmd is None and self._config_reset_cmd is None
if (self._restart_method is None mbaud = self._serial.get_msgparser().get_constant('SERIAL_BAUD', None)
and (self._reset_cmd is not None if self._restart_method is None and mbaud is None and not ext_only:
or self._config_reset_cmd is not None)
and msgparser.get_constant('SERIAL_BAUD', None) is None):
self._restart_method = 'command' self._restart_method = 'command'
self.register_response(self._handle_shutdown, 'shutdown') self.register_response(self._handle_shutdown, 'shutdown')
self.register_response(self._handle_shutdown, 'is_shutdown') self.register_response(self._handle_shutdown, 'is_shutdown')