aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2024-01-18 12:20:44 -0500
committerKevin O'Connor <kevin@koconnor.net>2024-01-18 12:25:08 -0500
commit1d92be71da90b7d1e7fba0392fd23b506e093bf6 (patch)
tree293f6a54ae513f767144b9516b2cef728b9d2160
parent6cc409f6fb9f62226c56adcf80be32a0d2601ab1 (diff)
downloadkutter-1d92be71da90b7d1e7fba0392fd23b506e093bf6.tar.gz
kutter-1d92be71da90b7d1e7fba0392fd23b506e093bf6.tar.xz
kutter-1d92be71da90b7d1e7fba0392fd23b506e093bf6.zip
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>
-rw-r--r--klippy/extras/force_move.py2
-rw-r--r--klippy/extras/manual_stepper.py2
-rw-r--r--klippy/extras/pwm_tool.py2
-rw-r--r--klippy/toolhead.py14
4 files changed, 10 insertions, 10 deletions
diff --git a/klippy/extras/force_move.py b/klippy/extras/force_move.py
index 5f47f8e2..50b80141 100644
--- a/klippy/extras/force_move.py
+++ b/klippy/extras/force_move.py
@@ -90,7 +90,7 @@ class ForceMove:
print_time + 99999.9)
stepper.set_trapq(prev_trapq)
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.flush_step_generation()
def _lookup_stepper(self, gcmd):
diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py
index 9f61e029..40db4a50 100644
--- a/klippy/extras/manual_stepper.py
+++ b/klippy/extras/manual_stepper.py
@@ -70,7 +70,7 @@ class ManualStepper:
self.trapq_finalize_moves(self.trapq, self.next_cmd_time + 99999.9,
self.next_cmd_time + 99999.9)
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:
self.sync_print_time()
def do_homing_move(self, movepos, speed, accel, triggered, check_trigger):
diff --git a/klippy/extras/pwm_tool.py b/klippy/extras/pwm_tool.py
index 704266a8..aa95ecbe 100644
--- a/klippy/extras/pwm_tool.py
+++ b/klippy/extras/pwm_tool.py
@@ -117,7 +117,7 @@ class MCU_queued_pwm:
# Continue flushing to resend time
wakeclock += self._duration_ticks
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):
clock = self._mcu.print_time_to_clock(print_time)
if self._invert:
diff --git a/klippy/toolhead.py b/klippy/toolhead.py
index 64189ca2..ce014365 100644
--- a/klippy/toolhead.py
+++ b/klippy/toolhead.py
@@ -349,8 +349,8 @@ class ToolHead:
# Generate steps for moves
if self.special_queuing_state:
self._update_drip_move_time(next_move_time)
- self.note_kinematic_activity(next_move_time + self.kin_flush_delay,
- set_step_gen_time=True)
+ self.note_mcu_movequeue_activity(next_move_time + self.kin_flush_delay,
+ set_step_gen_time=True)
self._advance_move_time(next_move_time)
def _flush_lookahead(self):
# Transit from "NeedPrime"/"Priming"/"Drip"/main state to "NeedPrime"
@@ -503,8 +503,8 @@ class ToolHead:
self.drip_completion.wait(curtime + wait_time)
continue
npt = min(self.print_time + DRIP_SEGMENT_TIME, next_print_time)
- self.note_kinematic_activity(npt + self.kin_flush_delay,
- set_step_gen_time=True)
+ self.note_mcu_movequeue_activity(npt + self.kin_flush_delay,
+ set_step_gen_time=True)
self._advance_move_time(npt)
def drip_move(self, newpos, speed, drip_completion):
self.dwell(self.kin_flush_delay)
@@ -588,10 +588,10 @@ class ToolHead:
callback(self.get_last_move_time())
return
last_move.timing_callbacks.append(callback)
- def note_kinematic_activity(self, kin_time, set_step_gen_time=False):
- self.need_flush_time = max(self.need_flush_time, kin_time)
+ def note_mcu_movequeue_activity(self, mq_time, set_step_gen_time=False):
+ self.need_flush_time = max(self.need_flush_time, mq_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:
self.do_kick_flush_timer = False
self.reactor.update_timer(self.flush_timer, self.reactor.NOW)