Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-11-01 19:05:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

toolhead: Minor code movement

Browse Source 
Move flushing and priming code together.  No code changes - only code
movement.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2025-10-03 17:49:06 -04:00
parent 3f9733d04d
commit 7f177aad1a
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
klippy/toolhead.py
View File

@@ -303,6 +303,13 @@ class ToolHead:
self.check_stall_time = 0. self.check_stall_time = 0.
if is_runout and prev_print_time != self.print_time: if is_runout and prev_print_time != self.print_time:
self.check_stall_time = self.print_time self.check_stall_time = self.print_time
def _handle_step_flush(self, flush_time, step_gen_time):
if self.special_queuing_state:
return
# In "main" state - flush lookahead if buffer runs low
kin_flush_delay = self.motion_queuing.get_kin_flush_delay()
if step_gen_time >= self.print_time - kin_flush_delay - 0.001:
self._flush_lookahead(is_runout=True)
def flush_step_generation(self): def flush_step_generation(self):
self._flush_lookahead() self._flush_lookahead()
self.motion_queuing.flush_all_steps() self.motion_queuing.flush_all_steps()
@@ -313,6 +320,16 @@ class ToolHead:
else: else:
self._process_lookahead() self._process_lookahead()
return self.print_time return self.print_time
def _priming_handler(self, eventtime):
self.reactor.unregister_timer(self.priming_timer)
self.priming_timer = None
try:
if self.special_queuing_state == "Priming":
self._flush_lookahead(is_runout=True)
except:
logging.exception("Exception in priming_handler")
self.printer.invoke_shutdown("Exception in priming_handler")
return self.reactor.NEVER
def _check_priming_state(self, eventtime): def _check_priming_state(self, eventtime):
est_print_time = self.mcu.estimated_print_time(eventtime) est_print_time = self.mcu.estimated_print_time(eventtime)
if self.check_stall_time: if self.check_stall_time:
@@ -349,23 +366,6 @@ class ToolHead:
if not self.special_queuing_state: if not self.special_queuing_state:
# In main state - defer pause checking until needed # In main state - defer pause checking until needed
self.need_check_pause = est_print_time + BUFFER_TIME_HIGH self.need_check_pause = est_print_time + BUFFER_TIME_HIGH
def _priming_handler(self, eventtime):
self.reactor.unregister_timer(self.priming_timer)
self.priming_timer = None
try:
if self.special_queuing_state == "Priming":
self._flush_lookahead(is_runout=True)
except:
logging.exception("Exception in priming_handler")
self.printer.invoke_shutdown("Exception in priming_handler")
return self.reactor.NEVER
def _handle_step_flush(self, flush_time, step_gen_time):
if self.special_queuing_state:
return
# In "main" state - flush lookahead if buffer runs low
kin_flush_delay = self.motion_queuing.get_kin_flush_delay()
if step_gen_time >= self.print_time - kin_flush_delay - 0.001:
self._flush_lookahead(is_runout=True)
# Movement commands # Movement commands
def get_position(self): def get_position(self):
return list(self.commanded_pos) return list(self.commanded_pos)