mirror of
https://github.com/Klipper3d/klipper.git
synced 2025-07-24 15:14:00 -06:00
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>
This commit is contained in:
parent
b23346a521
commit
feb15eaf2e
7 changed files with 63 additions and 74 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue