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

screws_tilt_adjust: Add new screws_tilt_adjust tool (#1367)

Browse Source 
Signed-off-by: Rui Caridade <rui.mcbc@gmail.com>
This commit is contained in:
Rui Caridade
2019-03-08 16:47:17 +00:00
committed by KevinOConnor
parent fcaa75f014
commit 5c0a2479be
8 changed files with 336 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
klippy/extras/probe.py
View File

@@ -240,6 +240,9 @@ class ProbePointsHelper:
self.samples = config.getint('samples', 1, minval=1)
self.sample_retract_dist = config.getfloat(
'sample_retract_dist', 2., above=0.)
self.samples_result = config.getchoice('samples_result',
{'median': 0, 'average': 1},
default='average')
# Internal probing state
self.results = []
self.busy = self.manual_probe = False
@@ -295,9 +298,26 @@ class ProbePointsHelper:
if i < self.samples - 1:
# retract
self._lift_z(self.sample_retract_dist, add=True)
avg_pos = [sum([pos[i] for pos in positions]) / self.samples
for i in range(3)]
self.results.append(avg_pos)
if self.samples_result == 1:
# Calculate Average
calculated_value = [sum([pos[i] for pos in positions]) /
self.samples for i in range(3)]
else:
# Calculate Median
sorted_z_positions = sorted([position[2]
for position in positions])
middle = self.samples // 2
if (self.samples & 1) == 1:
# odd number of samples
median = sorted_z_positions[middle]
else:
# even number of samples
median = (sorted_z_positions[middle] +
sorted_z_positions[middle - 1]) / 2
calculated_value = [positions[0][0],
positions[0][1],
median]
self.results.append(calculated_value)
def start_probe(self, params):
# Lookup objects
self.toolhead = self.printer.lookup_object('toolhead')