From 804f95ebe4961566603747165ec90a1676a0dc7d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 19 Feb 2020 12:07:30 -0500 Subject: 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 --- klippy/extras/bltouch.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'klippy/extras/bltouch.py') 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): -- cgit v1.2.3-70-g09d2