3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-11 00:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

probe: Perform multi-sample averaging in ProbePointsHelper class

Browse source 
Now that all the callers of ProbePointsHelper take a cartesian
coordinate for the probe locations, it's possible to perform averaging
of multi-sample probes within the class.  This simplifies the callers.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-09-26 12:15:39 -04:00 • committed by KevinOConnor
parent e5ef15ad0f
commit 0e9b8abde2
4 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
klippy/extras/bed_mesh.py
View file

@ -246,11 +246,10 @@ class BedMeshCalibrate:
[0. for i in range(x_cnt)] for j in range(y_cnt)]
# Check for multi-sampled points
z_table_len = x_cnt * y_cnt
if len(positions) % z_table_len:
if len(positions) != z_table_len:
raise self.gcode.error(
("bed_mesh: Invalid probe table length:\n"
"Sampled table length: %d") % len(positions))
samples = len(positions) / z_table_len
# Populate the organized probed table
for i in range(z_table_len):
y_position = i / x_cnt
@ -261,11 +260,8 @@ class BedMeshCalibrate:
else:
# Odd y count, x probed in the negative directon
x_position = (x_cnt - 1) - (i % x_cnt)
idx = i * samples
end = idx + samples
avg_z = sum(p[2] for p in positions[idx:end]) / samples
self.probed_z_table[y_position][x_position] = \
avg_z - z_offset
positions[i][2] - z_offset
if self.build_map:
outdict = {'z_probe_offsets:': self.probed_z_table}
self.gcode.respond(json.dumps(outdict))