aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/manual_stepper.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2020-02-12 13:03:42 -0500
committerKevinOConnor <kevin@koconnor.net>2020-02-15 17:52:44 -0500
commitfeb15eaf2e5e3b64f5e847d8f66f046959304335 (patch)
tree41c6cdfec8c701bfa826c3d8422cc54c1c0e3f05 /klippy/extras/manual_stepper.py
parentb23346a521b4b6e671ceecd85ce04ef5a03a644b (diff)
downloadkutter-feb15eaf2e5e3b64f5e847d8f66f046959304335.tar.gz
kutter-feb15eaf2e5e3b64f5e847d8f66f046959304335.tar.xz
kutter-feb15eaf2e5e3b64f5e847d8f66f046959304335.zip
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 <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/manual_stepper.py')
-rw-r--r--klippy/extras/manual_stepper.py11
1 files changed, 1 insertions, 10 deletions
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)