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

toolhead: Rename note_kinematic_activity() to note_mcu_movequeue_activity() 

Rename this function to make it more clear why it is called.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2024-01-18 12:20:44 -05:00
parent 6cc409f6fb
commit 1d92be71da
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
klippy/extras/force_move.py
View File

@ -90,7 +90,7 @@ class ForceMove:
print_time + 99999.9) print_time + 99999.9)
stepper.set_trapq(prev_trapq) stepper.set_trapq(prev_trapq)
stepper.set_stepper_kinematics(prev_sk) stepper.set_stepper_kinematics(prev_sk)
toolhead.note_kinematic_activity(print_time) toolhead.note_mcu_movequeue_activity(print_time)
toolhead.dwell(accel_t + cruise_t + accel_t) toolhead.dwell(accel_t + cruise_t + accel_t)
toolhead.flush_step_generation() toolhead.flush_step_generation()
def _lookup_stepper(self, gcmd): def _lookup_stepper(self, gcmd):

2
klippy/extras/manual_stepper.py
View File

@ -70,7 +70,7 @@ class ManualStepper:
self.trapq_finalize_moves(self.trapq, self.next_cmd_time + 99999.9, self.trapq_finalize_moves(self.trapq, self.next_cmd_time + 99999.9,
self.next_cmd_time + 99999.9) self.next_cmd_time + 99999.9)
toolhead = self.printer.lookup_object('toolhead') toolhead = self.printer.lookup_object('toolhead')
toolhead.note_kinematic_activity(self.next_cmd_time) toolhead.note_mcu_movequeue_activity(self.next_cmd_time)
if sync: if sync:
self.sync_print_time() self.sync_print_time()
def do_homing_move(self, movepos, speed, accel, triggered, check_trigger): def do_homing_move(self, movepos, speed, accel, triggered, check_trigger):

2
klippy/extras/pwm_tool.py
View File

@ -117,7 +117,7 @@ class MCU_queued_pwm:
# Continue flushing to resend time # Continue flushing to resend time
wakeclock += self._duration_ticks wakeclock += self._duration_ticks
wake_print_time = self._mcu.clock_to_print_time(wakeclock) wake_print_time = self._mcu.clock_to_print_time(wakeclock)
self._toolhead.note_kinematic_activity(wake_print_time) self._toolhead.note_mcu_movequeue_activity(wake_print_time)
def set_pwm(self, print_time, value): def set_pwm(self, print_time, value):
clock = self._mcu.print_time_to_clock(print_time) clock = self._mcu.print_time_to_clock(print_time)
if self._invert: if self._invert:

14
klippy/toolhead.py
View File

@ -349,8 +349,8 @@ class ToolHead:
# Generate steps for moves # Generate steps for moves
if self.special_queuing_state: if self.special_queuing_state:
self._update_drip_move_time(next_move_time) self._update_drip_move_time(next_move_time)
self.note_kinematic_activity(next_move_time + self.kin_flush_delay, self.note_mcu_movequeue_activity(next_move_time + self.kin_flush_delay,
set_step_gen_time=True) set_step_gen_time=True)
self._advance_move_time(next_move_time) self._advance_move_time(next_move_time)
def _flush_lookahead(self): def _flush_lookahead(self):
# Transit from "NeedPrime"/"Priming"/"Drip"/main state to "NeedPrime" # Transit from "NeedPrime"/"Priming"/"Drip"/main state to "NeedPrime"
@ -503,8 +503,8 @@ class ToolHead:
self.drip_completion.wait(curtime + wait_time) self.drip_completion.wait(curtime + wait_time)
continue continue
npt = min(self.print_time + DRIP_SEGMENT_TIME, next_print_time) npt = min(self.print_time + DRIP_SEGMENT_TIME, next_print_time)
self.note_kinematic_activity(npt + self.kin_flush_delay, self.note_mcu_movequeue_activity(npt + self.kin_flush_delay,
set_step_gen_time=True) set_step_gen_time=True)
self._advance_move_time(npt) self._advance_move_time(npt)
def drip_move(self, newpos, speed, drip_completion): def drip_move(self, newpos, speed, drip_completion):
self.dwell(self.kin_flush_delay) self.dwell(self.kin_flush_delay)
@ -588,10 +588,10 @@ class ToolHead:
callback(self.get_last_move_time()) callback(self.get_last_move_time())
return return
last_move.timing_callbacks.append(callback) last_move.timing_callbacks.append(callback)
def note_kinematic_activity(self, kin_time, set_step_gen_time=False): def note_mcu_movequeue_activity(self, mq_time, set_step_gen_time=False):
self.need_flush_time = max(self.need_flush_time, kin_time) self.need_flush_time = max(self.need_flush_time, mq_time)
if set_step_gen_time: if set_step_gen_time:
self.step_gen_time = max(self.step_gen_time, kin_time) self.step_gen_time = max(self.step_gen_time, mq_time)
if self.do_kick_flush_timer: if self.do_kick_flush_timer:
self.do_kick_flush_timer = False self.do_kick_flush_timer = False
self.reactor.update_timer(self.flush_timer, self.reactor.NOW) self.reactor.update_timer(self.flush_timer, self.reactor.NOW)