diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-11-07 18:06:46 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-07 18:06:46 -0500 |
| commit | 2d5c761101dbf01b53d669f41fa4edb71e8c5cc5 (patch) | |
| tree | bc90a7e1b7d7e20329a27cf6832e0c193df8564f /klippy/toolhead.py | |
| parent | 3665e9fc53682ea3cddf49c24e10974c78f2d28c (diff) | |
| download | kutter-2d5c761101dbf01b53d669f41fa4edb71e8c5cc5.tar.gz kutter-2d5c761101dbf01b53d669f41fa4edb71e8c5cc5.tar.xz kutter-2d5c761101dbf01b53d669f41fa4edb71e8c5cc5.zip | |
toolhead: Clear any pending pauses when a shutdown occurs
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/toolhead.py')
| -rw-r--r-- | klippy/toolhead.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/klippy/toolhead.py b/klippy/toolhead.py index 22effb99..d802df7e 100644 --- a/klippy/toolhead.py +++ b/klippy/toolhead.py @@ -198,6 +198,9 @@ class ToolHead: self.all_mcus = [ m for n, m in self.printer.lookup_objects(module='mcu')] self.mcu = self.all_mcus[0] + self.can_pause = True + if self.mcu.is_fileoutput(): + self.can_pause = False self.move_queue = MoveQueue(self) self.commanded_pos = [0., 0., 0., 0.] self.printer.register_event_handler("gcode:request_restart", @@ -356,7 +359,7 @@ class ToolHead: stall_time = buffer_time - self.buffer_time_high if stall_time <= 0.: break - if self.mcu.is_fileoutput(): + if not self.can_pause: self.need_check_stall = self.reactor.NEVER return eventtime = self.reactor.pause(eventtime + min(1., stall_time)) @@ -413,11 +416,11 @@ class ToolHead: logging.debug('; Max time of %f', last_move_time) def wait_moves(self): self._flush_lookahead() - if self.mcu.is_fileoutput(): - return eventtime = self.reactor.monotonic() while (not self.special_queuing_state or self.print_time >= self.mcu.estimated_print_time(eventtime)): + if not self.can_pause: + break eventtime = self.reactor.pause(eventtime + 0.100) def set_extruder(self, extruder): last_move_time = self.get_last_move_time() @@ -436,7 +439,7 @@ class ToolHead: curtime = self.reactor.monotonic() est_print_time = self.mcu.estimated_print_time(curtime) wait_time = self.print_time - est_print_time - DRIP_TIME - if wait_time > 0. and not self.mcu.is_fileoutput(): + if wait_time > 0. and self.can_pause: # Pause before sending more steps self.drip_completion.wait(curtime + wait_time) continue @@ -493,6 +496,7 @@ class ToolHead: def _handle_request_restart(self, print_time): self.motor_off() def _handle_shutdown(self): + self.can_pause = False self.move_queue.reset() def get_kinematics(self): return self.kin |