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 <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2019-06-03 13:01:57 -04:00
committed by KevinOConnor
parent e9935e1a41
commit 67964e71f1
2 changed files with 6 additions and 6 deletions

View File

@@ -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