3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-08 07:27:43 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mcu: Default the restart method to 'command' on non-serial ports

Browse source 
If the mcu supports command restarts and it does not appear to use a
real serial port, then default the restart method to 'command'.  This
is a better default on boards with native USB support.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-01-29 10:16:42 -05:00
parent a67306c76b
commit 077a56c2ca
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
klippy/mcu.py
View file

@ -428,9 +428,9 @@ class MCU:
# Restarts
self._restart_method = 'command'
if baud:
rmethods = {m: m for m in ['arduino', 'command', 'rpi_usb']}
rmethods = {m: m for m in [None, 'arduino', 'command', 'rpi_usb']}
self._restart_method = config.getchoice(
'restart_method', rmethods, 'arduino')
'restart_method', rmethods, None)
self._reset_cmd = self._config_reset_cmd = None
self._emergency_stop_cmd = None
self._is_shutdown = self._is_timeout = False
@ -600,6 +600,12 @@ 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")
if (self._restart_method is None
and (self._reset_cmd is not None
or self.config_reset_cmd is not None)
and self._serial.msgparser.get_constant(
'SERIAL_BAUD', None) is None):
self._restart_method = 'command'
self.register_msg(self.handle_shutdown, 'shutdown')
self.register_msg(self.handle_shutdown, 'is_shutdown')
self.register_msg(self.handle_mcu_stats, 'stats')