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

bed_mesh: log when fade completes. 

- Also simplify the math for the mesh x and y multipliers.

Signed-off-by: Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2019-01-26 18:08:32 -05:00 committed by KevinOConnor
parent 54683c9535
commit 542f941f07
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
klippy/extras/bed_mesh.py
View File

@ -65,6 +65,7 @@ class BedMesh:
self.fade_dist = self.fade_end - self.fade_start self.fade_dist = self.fade_end - self.fade_start
if self.fade_dist <= 0.: if self.fade_dist <= 0.:
self.fade_start = self.fade_end = self.FADE_DISABLE self.fade_start = self.fade_end = self.FADE_DISABLE
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.gcode = self.printer.lookup_object('gcode') self.gcode = self.printer.lookup_object('gcode')
@ -81,6 +82,7 @@ class BedMesh:
self.calibrate.load_default_profile() self.calibrate.load_default_profile()
def set_mesh(self, mesh): def set_mesh(self, mesh):
if mesh is not None: if mesh is not None:
self.log_fade_complete = True
if self.base_fade_target is None: if self.base_fade_target is None:
self.fade_target = mesh.avg_z self.fade_target = mesh.avg_z
else: else:
@ -128,6 +130,11 @@ class BedMesh:
if self.z_mesh is None or not factor: if self.z_mesh is None or not factor:
# No mesh calibrated, or mesh leveling phased out. # No mesh calibrated, or mesh leveling phased out.
x, y, z, e = newpos x, y, z, e = newpos
if self.log_fade_complete:
self.log_fade_complete = False
logging.info(
"bed_mesh fade complete: Current Z: %.4f fade_target: %.4f "
% (z, self.fade_target))
self.toolhead.move([x, y, z + self.fade_target, e], speed) self.toolhead.move([x, y, z + self.fade_target, e], speed)
else: else:
self.splitter.build_move(self.last_position, newpos, factor) self.splitter.build_move(self.last_position, newpos, factor)
@ -479,21 +486,19 @@ class ZMesh:
mesh_y_pps = params['mesh_y_pps'] mesh_y_pps = params['mesh_y_pps']
px_cnt = params['x_count'] px_cnt = params['x_count']
py_cnt = params['y_count'] py_cnt = params['y_count']
mesh_x_mult = mesh_x_pps + 1
mesh_y_mult = mesh_y_pps + 1
if px_cnt == 3 or py_cnt == 3: if px_cnt == 3 or py_cnt == 3:
# a mesh with 3 points on either axis defaults to legrange # a mesh with 3 points on either axis defaults to legrange
# upsampling # upsampling
self._sample = self._sample_lagrange self._sample = self._sample_lagrange
self.probe_params['algo'] = 'lagrange' self.probe_params['algo'] = 'lagrange'
if mesh_x_mult == 1 and mesh_y_mult == 1: if mesh_x_pps == 0 and mesh_y_pps == 0:
# No interpolation, sample the probed points directly # No interpolation, sample the probed points directly
self._sample = self._sample_direct self._sample = self._sample_direct
self.probe_params['algo'] = 'direct' self.probe_params['algo'] = 'direct'
self.mesh_x_count = px_cnt * mesh_x_mult - (mesh_x_mult - 1) self.mesh_x_count = (px_cnt - 1) * mesh_x_pps + px_cnt
self.mesh_y_count = py_cnt * mesh_y_mult - (mesh_y_mult - 1) self.mesh_y_count = (py_cnt - 1) * mesh_y_pps + py_cnt
self.x_mult = mesh_x_mult self.x_mult = mesh_x_pps + 1
self.y_mult = mesh_y_mult self.y_mult = mesh_y_pps + 1
logging.debug("bed_mesh: Mesh grid size - X:%d, Y:%d" logging.debug("bed_mesh: Mesh grid size - X:%d, Y:%d"
% (self.mesh_x_count, self.mesh_y_count)) % (self.mesh_x_count, self.mesh_y_count))
self.mesh_x_dist = (self.mesh_x_max - self.mesh_x_min) / \ self.mesh_x_dist = (self.mesh_x_max - self.mesh_x_min) / \