diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-08-06 13:05:09 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-08-06 13:05:09 -0400 |
| commit | fa7a91a38b55d89f66812b8c193b3734f9df3871 (patch) | |
| tree | 0f709542ad1466f51f70eb8b7e8b1b2d5e96ae7d | |
| parent | afada5e79edd935a82150c8838393f096997c8c4 (diff) | |
| download | kutter-fa7a91a38b55d89f66812b8c193b3734f9df3871.tar.gz kutter-fa7a91a38b55d89f66812b8c193b3734f9df3871.tar.xz kutter-fa7a91a38b55d89f66812b8c193b3734f9df3871.zip | |
homing: Improve error messages on a printer shutdown during homing
If a shutdown occurs during homing, make sure any follow up errors are
clear that the cause of the error is the shutdown. This suppresses
the confusing "Unable to obtain 'trsync_state' response" messages.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/extras/homing.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/klippy/extras/homing.py b/klippy/extras/homing.py index 1d7e1948..dc7acd62 100644 --- a/klippy/extras/homing.py +++ b/klippy/extras/homing.py @@ -184,12 +184,24 @@ class PrinterHoming: def manual_home(self, toolhead, endstops, pos, speed, triggered, check_triggered): hmove = HomingMove(self.printer, endstops, toolhead) - hmove.homing_move(pos, speed, triggered=triggered, - check_triggered=check_triggered) + try: + hmove.homing_move(pos, speed, triggered=triggered, + check_triggered=check_triggered) + except self.printer.command_error: + if self.printer.is_shutdown(): + raise self.printer.command_error( + "Homing failed due to printer shutdown") + raise def probing_move(self, mcu_probe, pos, speed): endstops = [(mcu_probe, "probe")] hmove = HomingMove(self.printer, endstops) - epos = hmove.homing_move(pos, speed, probe_pos=True) + try: + epos = hmove.homing_move(pos, speed, probe_pos=True) + except self.printer.command_error: + if self.printer.is_shutdown(): + raise self.printer.command_error( + "Probing failed due to printer shutdown") + raise if hmove.check_no_movement() is not None: raise self.printer.command_error( "Probe triggered prior to movement") @@ -208,6 +220,9 @@ class PrinterHoming: try: kin.home(homing_state) except self.printer.command_error: + if self.printer.is_shutdown(): + raise self.printer.command_error( + "Homing failed due to printer shutdown") self.printer.lookup_object('stepper_enable').motor_off() raise |