diff options
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/manual_stepper.py | 4 | ||||
| -rw-r--r-- | klippy/homing.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py index 01758d99..7cbbe806 100644 --- a/klippy/extras/manual_stepper.py +++ b/klippy/extras/manual_stepper.py @@ -89,12 +89,12 @@ class ManualStepper: for mcu_endstop, name in endstops: try: mcu_endstop.home_finalize() - except homing.EndstopError as e: + except homing.CommandError as e: if error is None: error = str(e) self.sync_print_time() if error is not None: - raise self.gcode.error(error) + raise homing.CommandError(error) cmd_MANUAL_STEPPER_help = "Command a manually configured stepper" def cmd_MANUAL_STEPPER(self, params): if 'ENABLE' in params: diff --git a/klippy/homing.py b/klippy/homing.py index ce37487d..c6e1ba83 100644 --- a/klippy/homing.py +++ b/klippy/homing.py @@ -61,7 +61,7 @@ class Homing: error = None try: self.toolhead.move(movepos, speed) - except EndstopError as e: + except CommandError as e: error = "Error during homing move: %s" % (str(e),) # Wait for endstops to trigger move_end_print_time = self.toolhead.get_last_move_time() @@ -80,11 +80,11 @@ class Homing: for mcu_endstop, name in endstops: try: mcu_endstop.home_finalize() - except EndstopError as e: + except CommandError as e: if error is None: error = str(e) if error is not None: - raise EndstopError(error) + raise CommandError(error) # Check if some movement occurred if verify_movement: for s, name, pos in start_mcu_pos: @@ -142,7 +142,7 @@ class Homing: self.changed_axes = axes try: self.toolhead.get_kinematics().home(self) - except EndstopError: + except CommandError: self.toolhead.motor_off() raise |