shinys000114/klipper
1
0
Fork 0
mirror of git://soft.sys114.com/klipper synced 2026-02-11 03:28:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

toolhead: Rename _full_flush() to flush_step_generation() and use globally

Browse Source 
Update code that modifies the low-level kinematics handlers to first
call toolhead.flush_step_generation().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2019-11-13 23:34:21 -05:00
parent 7c80e8d533
commit 2843c85019
7 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klippy/extras/bltouch.py
View File

@@ -144,6 +144,8 @@ class BLTouchEndstopWrapper:
self.send_cmd(None)
self.sync_print_time()
self.mcu_endstop.home_prepare()
toolhead = self.printer.lookup_object('toolhead')
toolhead.flush_step_generation()
self.start_mcu_pos = [(s, s.get_mcu_position())
for s in self.mcu_endstop.get_steppers()]
def home_finalize(self):

3
klippy/extras/force_move.py
View File

@@ -71,10 +71,11 @@ class ForceMove:
toolhead.dwell(STALL_TIME)
def manual_move(self, stepper, dist, speed, accel=0.):
toolhead = self.printer.lookup_object('toolhead')
print_time = toolhead.get_last_move_time()
toolhead.flush_step_generation()
prev_sk = stepper.set_stepper_kinematics(self.stepper_kinematics)
stepper.set_position((0., 0., 0.))
axis_r, accel_t, cruise_t, cruise_v = calc_move_time(dist, speed, accel)
print_time = toolhead.get_last_move_time()
self.trapq_append(self.trapq, print_time, accel_t, cruise_t, accel_t,
0., 0., 0., axis_r, 0., 0., 0., cruise_v, accel)
print_time += accel_t + cruise_t + accel_t

2
klippy/extras/manual_probe.py
View File

@@ -82,7 +82,7 @@ class ManualProbeHelper:
toolhead_pos = self.toolhead.get_position()
if toolhead_pos == self.last_toolhead_pos:
return self.last_kinematics_pos
self.toolhead.get_last_move_time()
self.toolhead.flush_step_generation()
kin = self.toolhead.get_kinematics()
for s in kin.get_steppers():
s.set_tag_position(s.get_commanded_position())

4
klippy/extras/z_tilt.py
View File

@@ -35,6 +35,7 @@ class ZAdjustHelper:
msg = "Making the following Z adjustments:\n%s" % ("\n".join(stepstrs),)
gcode.respond_info(msg)
# Disable Z stepper movements
toolhead.flush_step_generation()
for s in self.z_steppers:
s.set_trapq(None)
# Move each z stepper (sorted from lowest to highest) until they match
@@ -45,6 +46,7 @@ class ZAdjustHelper:
for i in range(len(positions)-1):
stepper_offset, stepper = positions[i]
next_stepper_offset, next_stepper = positions[i+1]
toolhead.flush_step_generation()
stepper.set_trapq(toolhead.get_trapq())
curpos[2] = z_low + next_stepper_offset
try:
@@ -52,11 +54,13 @@ class ZAdjustHelper:
toolhead.set_position(curpos)
except:
logging.exception("ZAdjustHelper adjust_steppers")
toolhead.flush_step_generation()
for s in self.z_steppers:
s.set_trapq(toolhead.get_trapq())
raise
# Z should now be level - do final cleanup
last_stepper_offset, last_stepper = positions[-1]
toolhead.flush_step_generation()
last_stepper.set_trapq(toolhead.get_trapq())
curpos[2] += first_stepper_offset
toolhead.set_position(curpos)