From d9a32f75fa953ca50f30a3d996e4dbd5b2154b87 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 22 Jun 2018 15:33:12 -0400 Subject: [PATCH] probe: Rename get_position() callback to get_probed_position() The different uses of get_position() can be confusing, so choose a different name for the ProbePointsHelper callback. Signed-off-by: Kevin O'Connor --- klippy/extras/bed_tilt.py | 2 +- klippy/extras/delta_calibrate.py | 2 +- klippy/extras/probe.py | 2 +- klippy/extras/z_tilt.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/klippy/extras/bed_tilt.py b/klippy/extras/bed_tilt.py index ae8772aa..6835ff78 100644 --- a/klippy/extras/bed_tilt.py +++ b/klippy/extras/bed_tilt.py @@ -48,7 +48,7 @@ class BedTiltCalibrate: def cmd_BED_TILT_CALIBRATE(self, params): self.gcode.run_script("G28") self.probe_helper.start_probe() - def get_position(self): + def get_probed_position(self): kin = self.printer.lookup_object('toolhead').get_kinematics() return kin.calc_position() def finalize(self, z_offset, positions): diff --git a/klippy/extras/delta_calibrate.py b/klippy/extras/delta_calibrate.py index 30acd778..18f5671e 100644 --- a/klippy/extras/delta_calibrate.py +++ b/klippy/extras/delta_calibrate.py @@ -30,7 +30,7 @@ class DeltaCalibrate: def cmd_DELTA_CALIBRATE(self, params): self.gcode.run_script("G28") self.probe_helper.start_probe() - def get_position(self): + def get_probed_position(self): kin = self.printer.lookup_object('toolhead').get_kinematics() return kin.get_stable_position() def finalize(self, z_offset, positions): diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index ca5916ba..f89770a6 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -207,7 +207,7 @@ class ProbePointsHelper: def cmd_NEXT(self, params): # Record current position self.toolhead.wait_moves() - self.results.append(self.callback.get_position()) + self.results.append(self.callback.get_probed_position()) # Lift toolhead curpos = self.toolhead.get_position() curpos[2] = self.horizontal_move_z diff --git a/klippy/extras/z_tilt.py b/klippy/extras/z_tilt.py index df630241..71d53831 100644 --- a/klippy/extras/z_tilt.py +++ b/klippy/extras/z_tilt.py @@ -44,7 +44,7 @@ class ZTilt: cmd_Z_TILT_ADJUST_help = "Adjust the Z tilt" def cmd_Z_TILT_ADJUST(self, params): self.probe_helper.start_probe() - def get_position(self): + def get_probed_position(self): kin = self.printer.lookup_object('toolhead').get_kinematics() return kin.calc_position() def finalize(self, z_offset, positions):