From feb15eaf2e5e3b64f5e847d8f66f046959304335 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 12 Feb 2020 13:03:42 -0500 Subject: homing: Merge home_prepare()/home_finalize() into move_begin/move_end events Collapse the "homing:move_begin", "homing:move_end", home_prepare(), and home_finalize() into two new events: "homing:homing_move_begin" and "homing:homing_move_end". This simplifies the homing code. Signed-off-by: Kevin O'Connor --- klippy/extras/manual_stepper.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'klippy/extras/manual_stepper.py') diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py index 83e91850..ca6d0dd3 100644 --- a/klippy/extras/manual_stepper.py +++ b/klippy/extras/manual_stepper.py @@ -77,12 +77,9 @@ class ManualStepper: def do_homing_move(self, movepos, speed, accel, triggered): if not self.can_home: raise self.gcode.error("No endstop for this manual stepper") - # Notify endstops of upcoming home - endstops = self.rail.get_endstops() - for mcu_endstop, name in endstops: - mcu_endstop.home_prepare() # Start endstop checking self.sync_print_time() + endstops = self.rail.get_endstops() for mcu_endstop, name in endstops: min_step_dist = min([s.get_step_dist() for s in mcu_endstop.get_steppers()]) @@ -99,12 +96,6 @@ class ManualStepper: except mcu_endstop.TimeoutError as e: if error is None: error = "Failed to home %s: %s" % (name, str(e)) - for mcu_endstop, name in endstops: - try: - mcu_endstop.home_finalize() - except homing.CommandError as e: - if error is None: - error = str(e) self.sync_print_time() if error is not None: raise homing.CommandError(error) -- cgit v1.2.3-70-g09d2