aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2021-01-11 10:01:14 -0500
committerKevin O'Connor <kevin@koconnor.net>2021-01-11 10:01:14 -0500
commitc57352a336981cecd87447197f2273b9677d8948 (patch)
tree70be1f6372d2244015520bc372ee66943076e403 /klippy/extras
parentee7230893d8b64c34502bacfd7d6a378e27bc70a (diff)
downloadkutter-c57352a336981cecd87447197f2273b9677d8948.tar.gz
kutter-c57352a336981cecd87447197f2273b9677d8948.tar.xz
kutter-c57352a336981cecd87447197f2273b9677d8948.zip
homing: Fix references to CommandError()
Commit ea85d419 moved CommandError from homing.py to gcode.py, but failed to fix the references to CommandError within homing.py. Fix that. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
-rw-r--r--klippy/extras/homing.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/klippy/extras/homing.py b/klippy/extras/homing.py
index 283e0df7..f0b3dd09 100644
--- a/klippy/extras/homing.py
+++ b/klippy/extras/homing.py
@@ -69,7 +69,7 @@ class Homing:
error = None
try:
self.toolhead.drip_move(movepos, speed, all_endstop_trigger)
- except CommandError as e:
+ except self.printer.command_error 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()
@@ -92,18 +92,19 @@ class Homing:
try:
self.printer.send_event("homing:homing_move_end",
[es for es, name in endstops])
- except CommandError as e:
+ except self.printer.command_error as e:
if error is None:
error = str(e)
if error is not None:
- raise CommandError(error)
+ raise self.printer.command_error(error)
# Check if some movement occurred
if verify_movement:
for s, name, spos, epos in end_mcu_pos:
if spos == epos:
if probe_pos:
- raise CommandError("Probe triggered prior to movement")
- raise CommandError(
+ raise self.printer.command_error(
+ "Probe triggered prior to movement")
+ raise self.printer.command_error(
"Endstop %s still triggered after retract" % (name,))
def home_rails(self, rails, forcepos, movepos):
# Notify of upcoming homing operation
@@ -148,7 +149,7 @@ class Homing:
self.changed_axes = axes
try:
self.toolhead.get_kinematics().home(self)
- except CommandError:
+ except self.printer.command_error:
self.printer.lookup_object('stepper_enable').motor_off()
raise