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

probe: Add ability to multi-sample points to ProbePointsHelper

Browse source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2018-08-25 12:00:08 -04:00 • committed by Kevin O'Connor
parent 1588426229
commit 40b7ba5111
4 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
klippy/extras/bed_mesh.py
View file

@ -245,9 +245,15 @@ class BedMeshCalibrate:
# create a 2-D array representing the probed z-positions.
self.probed_z_table = [
[0. for i in range(x_cnt)] for j in range(y_cnt)]
# Extract probed z-positions from probed positions and add
# them to organized list
for i, pos in enumerate(positions):
# Check for multi-sampled points
z_table_len = x_cnt * y_cnt
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
x_position = 0
if y_position & 1 == 0:
@ -256,8 +262,11 @@ 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] = \
pos[2] - z_offset
avg_z - z_offset
if self.build_map:
outdict = {'z_probe_offsets:': self.probed_z_table}
self.gcode.respond(json.dumps(outdict))