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

bed_mesh: add ZFADE parameter to BED_MESH_OFFSET 

When a ZFADE value is passed to BED_MESH_OFFSET it is used
to adjust how fade is applied.   This resolves issues with
fade when SET_GCODE_OFFSET is used during a tool change.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2024-02-05 16:53:09 -05:00 committed by KevinOConnor
parent 1b24f6a2ad
commit 0cd16e956d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
klippy/extras/bed_mesh.py
View File

@ -102,6 +102,7 @@ class BedMesh:
self.log_fade_complete = False self.log_fade_complete = False
self.base_fade_target = config.getfloat('fade_target', None) self.base_fade_target = config.getfloat('fade_target', None)
self.fade_target = 0. self.fade_target = 0.
self.tool_offset = 0.
self.gcode = self.printer.lookup_object('gcode') self.gcode = self.printer.lookup_object('gcode')
self.splitter = MoveSplitter(config, self.gcode) self.splitter = MoveSplitter(config, self.gcode)
# setup persistent storage # setup persistent storage
@ -157,6 +158,7 @@ class BedMesh:
"mesh max: %.4f" % (self.fade_dist, min_z, max_z)) "mesh max: %.4f" % (self.fade_dist, min_z, max_z))
else: else:
self.fade_target = 0. self.fade_target = 0.
self.tool_offset = 0.
self.z_mesh = mesh self.z_mesh = mesh
self.splitter.initialize(mesh, self.fade_target) self.splitter.initialize(mesh, self.fade_target)
# cache the current position before a transform takes place # cache the current position before a transform takes place
@ -164,6 +166,7 @@ class BedMesh:
gcode_move.reset_last_position() gcode_move.reset_last_position()
self.update_status() self.update_status()
def get_z_factor(self, z_pos): def get_z_factor(self, z_pos):
z_pos += self.tool_offset
if z_pos >= self.fade_end: if z_pos >= self.fade_end:
return 0. return 0.
elif z_pos >= self.fade_start: elif z_pos >= self.fade_start:
@ -182,14 +185,15 @@ class BedMesh:
max_adj = self.z_mesh.calc_z(x, y) max_adj = self.z_mesh.calc_z(x, y)
factor = 1. factor = 1.
z_adj = max_adj - self.fade_target z_adj = max_adj - self.fade_target
if min(z, (z - max_adj)) >= self.fade_end: fade_z_pos = z + self.tool_offset
if min(fade_z_pos, (fade_z_pos - max_adj)) >= self.fade_end:
# Fade out is complete, no factor # Fade out is complete, no factor
factor = 0. factor = 0.
elif max(z, (z - max_adj)) >= self.fade_start: elif max(fade_z_pos, (fade_z_pos - max_adj)) >= self.fade_start:
# Likely in the process of fading out adjustment. # Likely in the process of fading out adjustment.
# Because we don't yet know the gcode z position, use # Because we don't yet know the gcode z position, use
# algebra to calculate the factor from the toolhead pos # algebra to calculate the factor from the toolhead pos
factor = ((self.fade_end + self.fade_target - z) / factor = ((self.fade_end + self.fade_target - fade_z_pos) /
(self.fade_dist - z_adj)) (self.fade_dist - z_adj))
factor = constrain(factor, 0., 1.) factor = constrain(factor, 0., 1.)
final_z_adj = factor * z_adj + self.fade_target final_z_adj = factor * z_adj + self.fade_target
@ -271,6 +275,9 @@ class BedMesh:
for i, axis in enumerate(['X', 'Y']): for i, axis in enumerate(['X', 'Y']):
offsets[i] = gcmd.get_float(axis, None) offsets[i] = gcmd.get_float(axis, None)
self.z_mesh.set_mesh_offsets(offsets) self.z_mesh.set_mesh_offsets(offsets)
tool_offset = gcmd.get_float("ZFADE", None)
if tool_offset is not None:
self.tool_offset = tool_offset
gcode_move = self.printer.lookup_object('gcode_move') gcode_move = self.printer.lookup_object('gcode_move')
gcode_move.reset_last_position() gcode_move.reset_last_position()
else: else: