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

mcu: Do not automatically restart MCU with new config if it is shutdown 

Normally, the MCU is restarted on a config change.  However, that
should not be done automatically if the MCU is in a shutdown state.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-05-28 11:44:42 -04:00
parent d798fae20b
commit 879c45db19
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
klippy/mcu.py
View File

@ -567,6 +567,9 @@ class MCU:
if start_reason == 'firmware_restart': if start_reason == 'firmware_restart':
raise error("Failed automated reset of MCU '%s'" % (self._name,)) raise error("Failed automated reset of MCU '%s'" % (self._name,))
if self._config_crc != config_params['crc']: if self._config_crc != config_params['crc']:
if config_params['is_shutdown']:
raise error("Can not update MCU '%s' config as it is shutdown"
% (self._name,))
self._check_restart("CRC mismatch") self._check_restart("CRC mismatch")
raise error("MCU '%s' CRC does not match config" % (self._name,)) raise error("MCU '%s' CRC does not match config" % (self._name,))
move_count = config_params['move_count'] move_count = config_params['move_count']

4
src/basecmd.c
View File

@ -201,8 +201,8 @@ static uint32_t config_crc;
void void
command_get_config(uint32_t *args) command_get_config(uint32_t *args)
{ {
sendf("config is_config=%c crc=%u move_count=%hu" sendf("config is_config=%c crc=%u move_count=%hu is_shutdown=%c"
, is_finalized(), config_crc, move_count); , is_finalized(), config_crc, move_count, sched_is_shutdown());
} }
DECL_COMMAND_FLAGS(command_get_config, HF_IN_SHUTDOWN, "get_config"); DECL_COMMAND_FLAGS(command_get_config, HF_IN_SHUTDOWN, "get_config");