From 1f5783a25056669a3d158fa0cf05271ef7f3a3fc Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 4 Apr 2025 13:38:56 -0400 Subject: probe: Remove ProbeEndstopSessionHelper Have all callers instantiate the individual helper classes directly. Signed-off-by: Kevin O'Connor --- klippy/extras/bltouch.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'klippy/extras/bltouch.py') diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 3d817d72..2bcb9cc1 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -64,7 +64,11 @@ class BLTouchProbe: self.cmd_helper = probe.ProbeCommandHelper( config, self, self.mcu_endstop.query_endstop) self.probe_offsets = probe.ProbeOffsetsHelper(config) - self.probe_session = probe.ProbeEndstopSessionHelper(config, self) + self.param_helper = probe.ProbeParameterHelper(config) + self.homing_helper = probe.HomingViaProbeHelper(config, self, + self.param_helper) + self.probe_session = probe.ProbeSessionHelper( + config, self.param_helper, self.homing_helper.start_probe_session) # Register BLTOUCH_DEBUG command self.gcode = self.printer.lookup_object('gcode') self.gcode.register_command("BLTOUCH_DEBUG", self.cmd_BLTOUCH_DEBUG, @@ -75,7 +79,7 @@ class BLTouchProbe: self.printer.register_event_handler("klippy:connect", self.handle_connect) def get_probe_params(self, gcmd=None): - return self.probe_session.get_probe_params(gcmd) + return self.param_helper.get_probe_params(gcmd) def get_offsets(self): return self.probe_offsets.get_offsets() def get_status(self, eventtime): -- cgit v1.2.3-70-g09d2