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

mcu: Remove set_ignore_move()

Browse Source 
Update callers of set_ignore_move() to use the trapq system to set a
stepper to ignore moves.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2019-10-29 12:06:46 -04:00
parent befd263260
commit bd3c8920f6
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klippy/extras/z_tilt.py
View File

@@ -36,7 +36,7 @@ class ZAdjustHelper:
gcode.respond_info(msg)
# Disable Z stepper movements
for s in self.z_steppers:
s.set_ignore_move(True)
s.set_trapq(None)
# Move each z stepper (sorted from lowest to highest) until they match
positions = [(-a, s) for a, s in zip(adjustments, self.z_steppers)]
positions.sort()
@@ -45,7 +45,7 @@ class ZAdjustHelper:
for i in range(len(positions)-1):
stepper_offset, stepper = positions[i]
next_stepper_offset, next_stepper = positions[i+1]
stepper.set_ignore_move(False)
stepper.set_trapq(toolhead.get_trapq())
curpos[2] = z_low + next_stepper_offset
try:
toolhead.move(curpos, speed)
@@ -53,11 +53,11 @@ class ZAdjustHelper:
except:
logging.exception("ZAdjustHelper adjust_steppers")
for s in self.z_steppers:
s.set_ignore_move(False)
s.set_trapq(toolhead.get_trapq())
raise
# Z should now be level - do final cleanup
last_stepper_offset, last_stepper = positions[-1]
last_stepper.set_ignore_move(False)
last_stepper.set_trapq(toolhead.get_trapq())
curpos[2] += first_stepper_offset
toolhead.set_position(curpos)
gcode.reset_last_position()