diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 2bcb9cc10..e39f70dbb 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -65,8 +65,8 @@ class BLTouchProbe: config, self, self.mcu_endstop.query_endstop) self.probe_offsets = probe.ProbeOffsetsHelper(config) self.param_helper = probe.ProbeParameterHelper(config) - self.homing_helper = probe.HomingViaProbeHelper(config, self, - self.param_helper) + self.homing_helper = probe.HomingViaProbeHelper( + config, self, self.probe_offsets, self.param_helper) self.probe_session = probe.ProbeSessionHelper( config, self.param_helper, self.homing_helper.start_probe_session) # Register BLTOUCH_DEBUG command diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 600d64e47..d09337223 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -198,9 +198,10 @@ class LookupZSteppers: # Homing via probe:z_virtual_endstop class HomingViaProbeHelper: - def __init__(self, config, mcu_probe, param_helper): + def __init__(self, config, mcu_probe, probe_offsets, param_helper): self.printer = config.get_printer() self.mcu_probe = mcu_probe + self.probe_offsets = probe_offsets self.param_helper = param_helper self.multi_probe_pending = False self.z_min_position = lookup_minimum_z(config) @@ -613,8 +614,8 @@ class PrinterProbe: self.mcu_probe.query_endstop) self.probe_offsets = ProbeOffsetsHelper(config) self.param_helper = ProbeParameterHelper(config) - self.homing_helper = HomingViaProbeHelper(config, self.mcu_probe, - self.param_helper) + self.homing_helper = HomingViaProbeHelper( + config, self.mcu_probe, self.probe_offsets, self.param_helper) self.probe_session = ProbeSessionHelper( config, self.param_helper, self.homing_helper.start_probe_session) def get_probe_params(self, gcmd=None): diff --git a/klippy/extras/probe_eddy_current.py b/klippy/extras/probe_eddy_current.py index 876728352..3e10f2a0f 100644 --- a/klippy/extras/probe_eddy_current.py +++ b/klippy/extras/probe_eddy_current.py @@ -549,7 +549,8 @@ class PrinterEddyProbe: self.probe_session = probe.ProbeSessionHelper( config, self.param_helper, self.eddy_descend.start_probe_session) mcu_probe = EddyEndstopWrapper(self.sensor_helper, self.eddy_descend) - probe.HomingViaProbeHelper(config, mcu_probe, self.param_helper) + probe.HomingViaProbeHelper( + config, mcu_probe, self.probe_offsets, self.param_helper) self.printer.add_object('probe', self) def add_client(self, cb): self.sensor_helper.add_client(cb) diff --git a/klippy/extras/smart_effector.py b/klippy/extras/smart_effector.py index 3caa4e6b7..87369f4f3 100644 --- a/klippy/extras/smart_effector.py +++ b/klippy/extras/smart_effector.py @@ -70,8 +70,8 @@ class SmartEffectorProbe: config, self, self.probe_wrapper.query_endstop) self.probe_offsets = probe.ProbeOffsetsHelper(config) self.param_helper = probe.ProbeParameterHelper(config) - self.homing_helper = probe.HomingViaProbeHelper(config, self, - self.param_helper) + self.homing_helper = probe.HomingViaProbeHelper( + config, self, self.probe_offsets, self.param_helper) self.probe_session = probe.ProbeSessionHelper( config, self.param_helper, self.homing_helper.start_probe_session) # SmartEffector control