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/homing_heaters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'klippy/extras/homing_heaters.py') diff --git a/klippy/extras/homing_heaters.py b/klippy/extras/homing_heaters.py index ff132180..6433869f 100644 --- a/klippy/extras/homing_heaters.py +++ b/klippy/extras/homing_heaters.py @@ -11,9 +11,9 @@ class HomingHeaters: self.printer = config.get_printer() self.printer.register_event_handler("klippy:connect", self.handle_connect) - self.printer.register_event_handler("homing:move_begin", + self.printer.register_event_handler("homing:homing_move_begin", self.handle_homing_move_begin) - self.printer.register_event_handler("homing:move_end", + self.printer.register_event_handler("homing:homing_move_end", self.handle_homing_move_end) self.heaters_to_disable = config.get("heaters", "") self.disable_heaters = [] @@ -49,7 +49,7 @@ class HomingHeaters: if self.flaky_steppers == [""]: return True steppers_being_homed = [s.get_name() - for es, name in endstops + for es in endstops for s in es.get_steppers()] return any(x in self.flaky_steppers for x in steppers_being_homed) def handle_homing_move_begin(self, endstops): -- cgit v1.2.3-70-g09d2