h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

probe: Implement ProbePointsHelper get_probed_position() locally

Browse Source 
Now that all users of ProbePointsHelper use the same
get_probed_position() code, it is possible to implement that locally
within the ProbePointsHelper class.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2018-09-26 10:32:57 -04:00
committed by KevinOConnor
parent ae4eb35a70
commit 8e7eac9b08
6 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
klippy/extras/delta_calibrate.py
View File

@@ -142,7 +142,7 @@ class DeltaCalibrate:
dist = radius * scatter[i]
points.append((math.cos(r) * dist, math.sin(r) * dist))
self.probe_helper = probe.ProbePointsHelper(
config, self, default_points=points)
config, self.probe_finalize, default_points=points)
# Restore probe stable positions
self.last_probe_positions = []
for i in range(999):
@@ -192,10 +192,7 @@ class DeltaCalibrate:
"%.3f,%.3f,%.3f" % tuple(spos1))
configfile.set(section, "distance%d_pos2" % (i,),
"%.3f,%.3f,%.3f" % tuple(spos2))
def get_probed_position(self):
kin = self.printer.lookup_object('toolhead').get_kinematics()
return kin.calc_position()
def finalize(self, offsets, positions):
def probe_finalize(self, offsets, positions):
# Convert positions into (z_offset, stable_position) pairs
z_offset = offsets[2]
kin = self.printer.lookup_object('toolhead').get_kinematics()