3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2026-01-17 21:35:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

probe_eddy_current: reload z_offset probe helper
Some checks failed
Build test / build (push) Waiting to run
Details
klipper3d deploy / deploy (push) Has been cancelled
Details

Browse source 
Currently, there is no way to adjust the calibration curve.
The existing z_offset infrastructure is not applicable
or disabled here.

To make it possible to fine tune calibration curve.
Reload Z_OFFSET helper for probe_eddy_current.

Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
This commit is contained in:
Timofey Titovets 2025-10-25 21:17:57 +02:00 • committed by KevinOConnor
parent 8ea7be5dd7
commit 51dcb09d12
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
klippy/extras/probe.py
View file

@ -36,7 +36,8 @@ def calc_probe_z_average(positions, method='average'):
# Helper to implement common probing commands
class ProbeCommandHelper:
def __init__(self, config, probe, query_endstop=None):
def __init__(self, config, probe, query_endstop=None,
replace_z_offset=False):
self.printer = config.get_printer()
self.probe = probe
self.query_endstop = query_endstop
@ -57,6 +58,8 @@ class ProbeCommandHelper:
# Other commands
gcode.register_command('PROBE_ACCURACY', self.cmd_PROBE_ACCURACY,
desc=self.cmd_PROBE_ACCURACY_help)
if replace_z_offset:
return
gcode.register_command('Z_OFFSET_APPLY_PROBE',
self.cmd_Z_OFFSET_APPLY_PROBE,
desc=self.cmd_Z_OFFSET_APPLY_PROBE_help)

22
klippy/extras/probe_eddy_current.py
View file

@ -31,6 +31,9 @@ class EddyCalibration:
gcode.register_mux_command("PROBE_EDDY_CURRENT_CALIBRATE", "CHIP",
cname, self.cmd_EDDY_CALIBRATE,
desc=self.cmd_EDDY_CALIBRATE_help)
gcode.register_command('Z_OFFSET_APPLY_PROBE',
self.cmd_Z_OFFSET_APPLY_PROBE,
desc=self.cmd_Z_OFFSET_APPLY_PROBE_help)
def is_calibrated(self):
return len(self.cal_freqs) > 2
def load_calibration(self, cal):
@ -236,13 +239,16 @@ class EddyCalibration:
if len(filtered) <= 8:
raise self.printer.command_error(
"Failed calibration - No usable data")
z_freq_pairs = [(pos, freq) for pos, freq, _, _ in filtered]
self._save_calibration(z_freq_pairs)
def _save_calibration(self, z_freq_pairs):
gcode = self.printer.lookup_object("gcode")
gcode.respond_info(
"The SAVE_CONFIG command will update the printer config file\n"
"and restart the printer.")
# Save results
cal_contents = []
for i, (pos, freq, _, _) in enumerate(filtered):
for i, (pos, freq) in enumerate(z_freq_pairs):
if not i % 3:
cal_contents.append('\n')
cal_contents.append("%.6f:%.3f" % (pos, freq))
@ -256,6 +262,17 @@ class EddyCalibration:
# Start manual probe
manual_probe.ManualProbeHelper(self.printer, gcmd,
self.post_manual_probe)
cmd_Z_OFFSET_APPLY_PROBE_help = "Adjust the probe's z_offset"
def cmd_Z_OFFSET_APPLY_PROBE(self, gcmd):
gcode_move = self.printer.lookup_object("gcode_move")
offset = gcode_move.get_status()['homing_origin'].z
if offset == 0:
gcmd.respond_info("Nothing to do: Z Offset is 0")
return
cal_zpos = [z - offset for z in self.cal_zpos]
z_freq_pairs = zip(cal_zpos, self.cal_freqs)
z_freq_pairs = sorted(z_freq_pairs)
self._save_calibration(z_freq_pairs)
def register_drift_compensation(self, comp):
self.drift_comp = comp
@ -519,7 +536,8 @@ class PrinterEddyProbe:
self.param_helper = probe.ProbeParameterHelper(config)
self.eddy_descend = EddyDescend(
config, self.sensor_helper, self.calibration, self.param_helper)
self.cmd_helper = probe.ProbeCommandHelper(config, self)
self.cmd_helper = probe.ProbeCommandHelper(config, self,
replace_z_offset=True)
self.probe_offsets = probe.ProbeOffsetsHelper(config)
self.probe_session = probe.ProbeSessionHelper(
config, self.param_helper, self.eddy_descend.start_probe_session)