From f72f94e299e33c77e6c1a4a75cf632fc8fc812e0 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 25 May 2024 20:52:18 -0400 Subject: probe: Move add_steppers() logic to HomingViaProbeHelper class Perform the initial add_steppers() configuration in a single location. Signed-off-by: Kevin O'Connor --- klippy/extras/probe.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'klippy/extras/probe.py') diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 6f35f5e1..bb09217a 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -179,6 +179,8 @@ class HomingViaProbeHelper: # Register z_virtual_endstop pin self.printer.lookup_object('pins').register_chip('probe', self) # Register event handlers + self.printer.register_event_handler('klippy:mcu_identify', + self._handle_mcu_identify) self.printer.register_event_handler("homing:homing_move_begin", self._handle_homing_move_begin) self.printer.register_event_handler("homing:homing_move_end", @@ -189,6 +191,11 @@ class HomingViaProbeHelper: self._handle_home_rails_end) self.printer.register_event_handler("gcode:command_error", self._handle_command_error) + def _handle_mcu_identify(self): + kin = self.printer.lookup_object('toolhead').get_kinematics() + for stepper in kin.get_steppers(): + if stepper.is_active_axis('z'): + self.mcu_probe.add_stepper(stepper) def _handle_homing_move_begin(self, hmove): if self.mcu_probe in hmove.get_mcu_endstops(): self.mcu_probe.probe_prepare(hmove) @@ -481,8 +488,6 @@ class ProbeEndstopWrapper: # Create an "endstop" object to handle the probe pin ppins = self.printer.lookup_object('pins') self.mcu_endstop = ppins.setup_pin('endstop', config.get('pin')) - self.printer.register_event_handler('klippy:mcu_identify', - self._handle_mcu_identify) # Wrappers self.get_mcu = self.mcu_endstop.get_mcu self.add_stepper = self.mcu_endstop.add_stepper @@ -492,11 +497,6 @@ class ProbeEndstopWrapper: self.query_endstop = self.mcu_endstop.query_endstop # multi probes state self.multi = 'OFF' - def _handle_mcu_identify(self): - kin = self.printer.lookup_object('toolhead').get_kinematics() - for stepper in kin.get_steppers(): - if stepper.is_active_axis('z'): - self.add_stepper(stepper) def _raise_probe(self): toolhead = self.printer.lookup_object('toolhead') start_pos = toolhead.get_position() -- cgit v1.2.3-70-g09d2