andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-08-24 03:44:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

probe: Remove ProbeEndstopSessionHelper

Browse Source 
Have all callers instantiate the individual helper classes directly.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2025-04-04 13:38:56 -04:00
parent 37952e8686
commit 1f5783a250
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
klippy/extras/bltouch.py
View File

@ -64,7 +64,11 @@ class BLTouchProbe:
self.cmd_helper = probe.ProbeCommandHelper( self.cmd_helper = probe.ProbeCommandHelper(
config, self, self.mcu_endstop.query_endstop) config, self, self.mcu_endstop.query_endstop)
self.probe_offsets = probe.ProbeOffsetsHelper(config) 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 # Register BLTOUCH_DEBUG command
self.gcode = self.printer.lookup_object('gcode') self.gcode = self.printer.lookup_object('gcode')
self.gcode.register_command("BLTOUCH_DEBUG", self.cmd_BLTOUCH_DEBUG, self.gcode.register_command("BLTOUCH_DEBUG", self.cmd_BLTOUCH_DEBUG,
@ -75,7 +79,7 @@ class BLTouchProbe:
self.printer.register_event_handler("klippy:connect", self.printer.register_event_handler("klippy:connect",
self.handle_connect) self.handle_connect)
def get_probe_params(self, gcmd=None): 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): def get_offsets(self):
return self.probe_offsets.get_offsets() return self.probe_offsets.get_offsets()
def get_status(self, eventtime): def get_status(self, eventtime):

20
klippy/extras/probe.py
View File

@ -393,18 +393,6 @@ class ProbeSessionHelper:
self.results = [] self.results = []
return res return res
# Helper for probes based purely on an endstop wrapper
class ProbeEndstopSessionHelper:
def __init__(self, config, mcu_probe):
self.param_helper = ProbeParameterHelper(config)
self.homing_helper = HomingViaProbeHelper(config, mcu_probe,
self.param_helper)
self.probe_session = ProbeSessionHelper(
config, self.param_helper, self.homing_helper.start_probe_session)
# Main printer probe session starting API
self.start_probe_session = self.probe_session.start_probe_session
self.get_probe_params = self.param_helper.get_probe_params
# Helper to read the xyz probe offsets from the config # Helper to read the xyz probe offsets from the config
class ProbeOffsetsHelper: class ProbeOffsetsHelper:
def __init__(self, config): def __init__(self, config):
@ -606,9 +594,13 @@ class PrinterProbe:
self.cmd_helper = ProbeCommandHelper(config, self, self.cmd_helper = ProbeCommandHelper(config, self,
self.mcu_probe.query_endstop) self.mcu_probe.query_endstop)
self.probe_offsets = ProbeOffsetsHelper(config) self.probe_offsets = ProbeOffsetsHelper(config)
self.probe_session = ProbeEndstopSessionHelper(config, self.mcu_probe) self.param_helper = ProbeParameterHelper(config)
self.homing_helper = HomingViaProbeHelper(config, self.mcu_probe,
self.param_helper)
self.probe_session = ProbeSessionHelper(
config, self.param_helper, self.homing_helper.start_probe_session)
def get_probe_params(self, gcmd=None): 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): def get_offsets(self):
return self.probe_offsets.get_offsets() return self.probe_offsets.get_offsets()
def get_status(self, eventtime): def get_status(self, eventtime):

8
klippy/extras/smart_effector.py
View File

@ -69,7 +69,11 @@ class SmartEffectorProbe:
self.cmd_helper = probe.ProbeCommandHelper( self.cmd_helper = probe.ProbeCommandHelper(
config, self, self.probe_wrapper.query_endstop) config, self, self.probe_wrapper.query_endstop)
self.probe_offsets = probe.ProbeOffsetsHelper(config) 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)
# SmartEffector control # SmartEffector control
control_pin = config.get('control_pin', None) control_pin = config.get('control_pin', None)
if control_pin: if control_pin:
@ -85,7 +89,7 @@ class SmartEffectorProbe:
self.cmd_SET_SMART_EFFECTOR, self.cmd_SET_SMART_EFFECTOR,
desc=self.cmd_SET_SMART_EFFECTOR_help) desc=self.cmd_SET_SMART_EFFECTOR_help)
def get_probe_params(self, gcmd=None): 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): def get_offsets(self):
return self.probe_offsets.get_offsets() return self.probe_offsets.get_offsets()
def get_status(self, eventtime): def get_status(self, eventtime):