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

probe: Add a default probing_move() function to HomingViaProbeHelper

Browse Source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2025-04-04 01:25:56 -04:00
parent db7a9cf071
commit 6a87c5e9f5
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
klippy/extras/bltouch.py
View File

@ -191,9 +191,6 @@ class BLTouchProbe:
self.verify_raise_probe() self.verify_raise_probe()
self.sync_print_time() self.sync_print_time()
self.multi = 'OFF' self.multi = 'OFF'
def probing_move(self, pos, speed):
phoming = self.printer.lookup_object('homing')
return phoming.probing_move(self, pos, speed)
def probe_prepare(self, hmove): def probe_prepare(self, hmove):
if self.multi == 'OFF' or self.multi == 'FIRST': if self.multi == 'OFF' or self.multi == 'FIRST':
self.lower_probe() self.lower_probe()

14
klippy/extras/probe.py
View File

@ -227,10 +227,14 @@ class HomingViaProbeHelper:
if pin_params['invert'] or pin_params['pullup']: if pin_params['invert'] or pin_params['pullup']:
raise pins.error("Can not pullup/invert probe virtual endstop") raise pins.error("Can not pullup/invert probe virtual endstop")
return self.mcu_probe return self.mcu_probe
# Helper to convert probe based commands to use homing module
def probing_move(self, pos, speed):
phoming = self.printer.lookup_object('homing')
return phoming.probing_move(self.mcu_probe, pos, speed)
# Helper to track multiple probe attempts in a single command # Helper to track multiple probe attempts in a single command
class ProbeSessionHelper: class ProbeSessionHelper:
def __init__(self, config, mcu_probe): def __init__(self, config, mcu_probe, probing_move_cb=None):
self.printer = config.get_printer() self.printer = config.get_printer()
self.mcu_probe = mcu_probe self.mcu_probe = mcu_probe
gcode = self.printer.lookup_object('gcode') gcode = self.printer.lookup_object('gcode')
@ -245,6 +249,9 @@ class ProbeSessionHelper:
self.z_position = pconfig.getfloat('minimum_z_position', 0., self.z_position = pconfig.getfloat('minimum_z_position', 0.,
note_valid=False) note_valid=False)
self.homing_helper = HomingViaProbeHelper(config, mcu_probe) self.homing_helper = HomingViaProbeHelper(config, mcu_probe)
self.probing_move_cb = probing_move_cb
if probing_move_cb is None:
self.probing_move_cb = self.homing_helper.probing_move
# Configurable probing speeds # Configurable probing speeds
self.speed = config.getfloat('speed', 5.0, above=0.) self.speed = config.getfloat('speed', 5.0, above=0.)
self.lift_speed = config.getfloat('lift_speed', self.speed, above=0.) self.lift_speed = config.getfloat('lift_speed', self.speed, above=0.)
@ -315,7 +322,7 @@ class ProbeSessionHelper:
pos = toolhead.get_position() pos = toolhead.get_position()
pos[2] = self.z_position pos[2] = self.z_position
try: try:
epos = self.mcu_probe.probing_move(pos, speed) epos = self.probing_move_cb(pos, speed)
except self.printer.command_error as e: except self.printer.command_error as e:
reason = str(e) reason = str(e)
if "Timeout during endstop homing" in reason: if "Timeout during endstop homing" in reason:
@ -544,9 +551,6 @@ class ProbeEndstopWrapper:
return return
self._raise_probe() self._raise_probe()
self.multi = 'OFF' self.multi = 'OFF'
def probing_move(self, pos, speed):
phoming = self.printer.lookup_object('homing')
return phoming.probing_move(self, pos, speed)
def probe_prepare(self, hmove): def probe_prepare(self, hmove):
if self.multi == 'OFF' or self.multi == 'FIRST': if self.multi == 'OFF' or self.multi == 'FIRST':
self._lower_probe() self._lower_probe()

3
klippy/extras/probe_eddy_current.py
View File

@ -428,7 +428,8 @@ class PrinterEddyProbe:
self.cmd_helper = probe.ProbeCommandHelper( self.cmd_helper = probe.ProbeCommandHelper(
config, self, self.mcu_probe.query_endstop) config, self, self.mcu_probe.query_endstop)
self.probe_offsets = probe.ProbeOffsetsHelper(config) self.probe_offsets = probe.ProbeOffsetsHelper(config)
self.probe_session = probe.ProbeSessionHelper(config, self.mcu_probe) self.probe_session = probe.ProbeSessionHelper(
config, self.mcu_probe, self.mcu_probe.probing_move)
self.printer.add_object('probe', self) self.printer.add_object('probe', self)
def add_client(self, cb): def add_client(self, cb):
self.sensor_helper.add_client(cb) self.sensor_helper.add_client(cb)

3
klippy/extras/smart_effector.py
View File

@ -92,9 +92,6 @@ class SmartEffectorProbe:
return self.cmd_helper.get_status(eventtime) return self.cmd_helper.get_status(eventtime)
def start_probe_session(self, gcmd): def start_probe_session(self, gcmd):
return self.probe_session.start_probe_session(gcmd) return self.probe_session.start_probe_session(gcmd)
def probing_move(self, pos, speed):
phoming = self.printer.lookup_object('homing')
return phoming.probing_move(self, pos, speed)
def probe_prepare(self, hmove): def probe_prepare(self, hmove):
toolhead = self.printer.lookup_object('toolhead') toolhead = self.printer.lookup_object('toolhead')
self.probe_wrapper.probe_prepare(hmove) self.probe_wrapper.probe_prepare(hmove)