diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-02-19 12:07:30 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-02-19 12:20:00 -0500 |
| commit | 804f95ebe4961566603747165ec90a1676a0dc7d (patch) | |
| tree | 7461ff95946ada095242460618323e1d511e8c07 /klippy/extras | |
| parent | fbbbbc85cf6b717a48c9c62cd39a219af0223655 (diff) | |
| download | kutter-804f95ebe4961566603747165ec90a1676a0dc7d.tar.gz kutter-804f95ebe4961566603747165ec90a1676a0dc7d.tar.xz kutter-804f95ebe4961566603747165ec90a1676a0dc7d.zip | |
homing: Don't raise a TimeoutError from home_wait()
Change home_wait() to return if the homing operation completed
succesfully or not. This simplifies the callers.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/bltouch.py | 6 | ||||
| -rw-r--r-- | klippy/extras/manual_stepper.py | 8 | ||||
| -rw-r--r-- | klippy/extras/probe.py | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index cf9146fc..d5b4becc 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -57,7 +57,6 @@ class BLTouchEndstopWrapper: self.get_steppers = self.mcu_endstop.get_steppers self.home_wait = self.mcu_endstop.home_wait self.query_endstop = self.mcu_endstop.query_endstop - self.TimeoutError = self.mcu_endstop.TimeoutError # Register BLTOUCH_DEBUG command self.gcode = self.printer.lookup_object('gcode') self.gcode.register_command("BLTOUCH_DEBUG", self.cmd_BLTOUCH_DEBUG, @@ -98,9 +97,8 @@ class BLTouchEndstopWrapper: self.mcu_endstop.home_start(check_start_time, ENDSTOP_SAMPLE_TIME, ENDSTOP_SAMPLE_COUNT, ENDSTOP_REST_TIME, triggered=triggered) - try: - self.mcu_endstop.home_wait(check_end_time) - except self.mcu_endstop.TimeoutError as e: + did_trigger = self.mcu_endstop.home_wait(check_end_time) + if not did_trigger: raise homing.EndstopError("BLTouch failed to %s" % (msg,)) def raise_probe(self): for retry in range(3): diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py index ca6d0dd3..ea3d63cf 100644 --- a/klippy/extras/manual_stepper.py +++ b/klippy/extras/manual_stepper.py @@ -91,11 +91,9 @@ class ManualStepper: # Wait for endstops to trigger error = None for mcu_endstop, name in endstops: - try: - mcu_endstop.home_wait(self.next_cmd_time) - except mcu_endstop.TimeoutError as e: - if error is None: - error = "Failed to home %s: %s" % (name, str(e)) + did_trigger = mcu_endstop.home_wait(self.next_cmd_time) + if not did_trigger and error is None: + error = "Failed to home %s: Timeout during homing" % (name,) self.sync_print_time() if error is not None: raise homing.CommandError(error) diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 1297a7d2..f1cb21b7 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -295,7 +295,6 @@ class ProbeEndstopWrapper: self.home_start = self.mcu_endstop.home_start self.home_wait = self.mcu_endstop.home_wait self.query_endstop = self.mcu_endstop.query_endstop - self.TimeoutError = self.mcu_endstop.TimeoutError def _build_config(self): kin = self.printer.lookup_object('toolhead').get_kinematics() for stepper in kin.get_steppers(): |