diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-05-28 11:44:42 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-05-29 10:57:29 -0400 |
| commit | 879c45db191251af2a00e75bf6ba89ab876c2fad (patch) | |
| tree | b440b161cd6ccfa8c97466fbd78688f6f3318452 | |
| parent | d798fae20b1cd87396ea884de737aa7f3e359193 (diff) | |
| download | kutter-879c45db191251af2a00e75bf6ba89ab876c2fad.tar.gz kutter-879c45db191251af2a00e75bf6ba89ab876c2fad.tar.xz kutter-879c45db191251af2a00e75bf6ba89ab876c2fad.zip | |
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>
| -rw-r--r-- | klippy/mcu.py | 3 | ||||
| -rw-r--r-- | src/basecmd.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index 7f1f7f51..2209ce4e 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -567,6 +567,9 @@ class MCU: if start_reason == 'firmware_restart': raise error("Failed automated reset of MCU '%s'" % (self._name,)) 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") raise error("MCU '%s' CRC does not match config" % (self._name,)) move_count = config_params['move_count'] diff --git a/src/basecmd.c b/src/basecmd.c index 08dc6ec2..8ce7a27c 100644 --- a/src/basecmd.c +++ b/src/basecmd.c @@ -201,8 +201,8 @@ static uint32_t config_crc; void command_get_config(uint32_t *args) { - sendf("config is_config=%c crc=%u move_count=%hu" - , is_finalized(), config_crc, move_count); + sendf("config is_config=%c crc=%u move_count=%hu is_shutdown=%c" + , is_finalized(), config_crc, move_count, sched_is_shutdown()); } DECL_COMMAND_FLAGS(command_get_config, HF_IN_SHUTDOWN, "get_config"); |