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>
This commit is contained in:
Kevin O'Connor
2020-02-19 12:07:30 -05:00
parent fbbbbc85cf
commit 804f95ebe4
5 changed files with 9 additions and 19 deletions

View File

@@ -71,11 +71,9 @@ class Homing:
# Wait for endstops to trigger
move_end_print_time = self.toolhead.get_last_move_time()
for mcu_endstop, name in endstops:
try:
mcu_endstop.home_wait(move_end_print_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(move_end_print_time)
if not did_trigger and error is None:
error = "Failed to home %s: Timeout during homing" % (name,)
# Determine stepper halt positions
self.toolhead.flush_step_generation()
end_mcu_pos = [(s, name, spos, s.get_mcu_position())