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

probe: Allow overriding horizontal_move_z on gcode

Browse Source 
Signed-off-by: Lasse Dalegaard <dalegaard@gmail.com>
This commit is contained in:
Lasse Dalegaard
2022-08-29 21:10:02 +02:00
committed by KevinOConnor
parent 5a69d0f857
commit ca6e5fe514
2 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klippy/extras/probe.py
View File

@@ -362,7 +362,8 @@ class ProbePointsHelper:
if default_points is None or config.get('points', None) is not None:
self.probe_points = config.getlists('points', seps=(',', '\n'),
parser=float, count=2)
self.horizontal_move_z = config.getfloat('horizontal_move_z', 5.)
def_move_z = config.getfloat('horizontal_move_z', 5.)
self.default_horizontal_move_z = def_move_z
self.speed = config.getfloat('speed', 50., above=0.)
self.use_offsets = False
# Internal probing state
@@ -408,6 +409,9 @@ class ProbePointsHelper:
probe = self.printer.lookup_object('probe', None)
method = gcmd.get('METHOD', 'automatic').lower()
self.results = []
def_move_z = self.default_horizontal_move_z
self.horizontal_move_z = gcmd.get_float('HORIZONTAL_MOVE_Z',
def_move_z)
if probe is None or method != 'automatic':
# Manual probe
self.lift_speed = self.speed