From 67964e71f17df13e03a0aaa1a6dcd6c9253da97d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 3 Jun 2019 13:01:57 -0400 Subject: homing: Catch the more generic CommandError during homing Allow the low-level homing code to raise either a gcode.error or an EndstopError during a fault. Signed-off-by: Kevin O'Connor --- klippy/homing.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'klippy/homing.py') 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 -- cgit v1.2.3-70-g09d2