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

probe: Use probe speed for initial move to the Z height 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-08-30 16:20:23 -04:00
parent f3edea2943
commit cf4f23ebf2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
klippy/extras/probe.py
View File

@ -183,15 +183,17 @@ class ProbePointsHelper:
return self.probe.last_home_position() return self.probe.last_home_position()
else: else:
return None return None
def lift_z(self, z_pos, add=False): def lift_z(self, z_pos, add=False, speed=None):
# Lift toolhead # Lift toolhead
curpos = self.toolhead.get_position() curpos = self.toolhead.get_position()
if add: if add:
curpos[2] += z_pos curpos[2] += z_pos
else: else:
curpos[2] = z_pos curpos[2] = z_pos
if speed is None:
speed = self.lift_speed
try: try:
self.toolhead.move(curpos, self.lift_speed) self.toolhead.move(curpos, speed)
except homing.EndstopError as e: except homing.EndstopError as e:
self.finalize(False) self.finalize(False)
raise self.gcode.error(str(e)) raise self.gcode.error(str(e))
@ -214,7 +216,7 @@ class ProbePointsHelper:
'NEXT', self.cmd_NEXT, desc=self.cmd_NEXT_help) 'NEXT', self.cmd_NEXT, desc=self.cmd_NEXT_help)
self.results = [] self.results = []
self.busy = True self.busy = True
self.lift_z(self.horizontal_move_z) self.lift_z(self.horizontal_move_z, speed=self.speed)
self.move_next() self.move_next()
if self.probe is not None: if self.probe is not None:
try: try: