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

toolhead: Rename last_kin_flush_time to force_flush_time 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2023-01-06 12:27:53 -05:00
parent bd2a849566
commit 52b33c1b81
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
klippy/toolhead.py
View File

@ -240,7 +240,7 @@ class ToolHead:
# Kinematic step generation scan window time tracking # Kinematic step generation scan window time tracking
self.kin_flush_delay = SDS_CHECK_TIME self.kin_flush_delay = SDS_CHECK_TIME
self.kin_flush_times = [] self.kin_flush_times = []
self.last_kin_flush_time = self.last_kin_move_time = 0. self.force_flush_time = self.last_kin_move_time = 0.
# Setup iterative solver # Setup iterative solver
ffi_main, ffi_lib = chelper.get_ffi() ffi_main, ffi_lib = chelper.get_ffi()
self.trapq = ffi_main.gc(ffi_lib.trapq_alloc(), ffi_lib.trapq_free) self.trapq = ffi_main.gc(ffi_lib.trapq_alloc(), ffi_lib.trapq_free)
@ -279,16 +279,16 @@ class ToolHead:
def _update_move_time(self, next_print_time): def _update_move_time(self, next_print_time):
batch_time = MOVE_BATCH_TIME batch_time = MOVE_BATCH_TIME
kin_flush_delay = self.kin_flush_delay kin_flush_delay = self.kin_flush_delay
lkft = self.last_kin_flush_time fft = self.force_flush_time
while 1: while 1:
self.print_time = min(self.print_time + batch_time, next_print_time) self.print_time = min(self.print_time + batch_time, next_print_time)
sg_flush_time = max(lkft, self.print_time - kin_flush_delay) sg_flush_time = max(fft, self.print_time - kin_flush_delay)
for sg in self.step_generators: for sg in self.step_generators:
sg(sg_flush_time) sg(sg_flush_time)
free_time = max(lkft, sg_flush_time - kin_flush_delay) free_time = max(fft, sg_flush_time - kin_flush_delay)
self.trapq_finalize_moves(self.trapq, free_time) self.trapq_finalize_moves(self.trapq, free_time)
self.extruder.update_move_time(free_time) self.extruder.update_move_time(free_time)
mcu_flush_time = max(lkft, sg_flush_time - self.move_flush_time) mcu_flush_time = max(fft, sg_flush_time - self.move_flush_time)
for m in self.all_mcus: for m in self.all_mcus:
m.flush_moves(mcu_flush_time) m.flush_moves(mcu_flush_time)
if self.print_time >= next_print_time: if self.print_time >= next_print_time:
@ -296,7 +296,7 @@ class ToolHead:
def _calc_print_time(self): def _calc_print_time(self):
curtime = self.reactor.monotonic() curtime = self.reactor.monotonic()
est_print_time = self.mcu.estimated_print_time(curtime) est_print_time = self.mcu.estimated_print_time(curtime)
kin_time = max(est_print_time + MIN_KIN_TIME, self.last_kin_flush_time) kin_time = max(est_print_time + MIN_KIN_TIME, self.force_flush_time)
kin_time += self.kin_flush_delay kin_time += self.kin_flush_delay
min_print_time = max(est_print_time + self.buffer_time_start, kin_time) min_print_time = max(est_print_time + self.buffer_time_start, kin_time)
if min_print_time > self.print_time: if min_print_time > self.print_time:
@ -343,8 +343,8 @@ class ToolHead:
self.idle_flush_print_time = 0. self.idle_flush_print_time = 0.
flush_time = self.last_kin_move_time + self.kin_flush_delay flush_time = self.last_kin_move_time + self.kin_flush_delay
flush_time = max(flush_time, self.print_time - self.kin_flush_delay) flush_time = max(flush_time, self.print_time - self.kin_flush_delay)
self.last_kin_flush_time = max(self.last_kin_flush_time, flush_time) self.force_flush_time = max(self.force_flush_time, flush_time)
self._update_move_time(max(self.print_time, self.last_kin_flush_time)) self._update_move_time(max(self.print_time, self.force_flush_time))
def _flush_lookahead(self): def _flush_lookahead(self):
if self.special_queuing_state: if self.special_queuing_state:
return self.flush_step_generation() return self.flush_step_generation()