toolhead: No need to transition to Flushed state before entering Drip state

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-11-14 18:32:24 -05:00
parent 430b8d0e52
commit 7c80e8d533
1 changed files with 5 additions and 3 deletions

View File

@ -433,11 +433,13 @@ class ToolHead:
npt = min(self.print_time + DRIP_SEGMENT_TIME, next_print_time) npt = min(self.print_time + DRIP_SEGMENT_TIME, next_print_time)
self._update_move_time(npt) self._update_move_time(npt)
def drip_move(self, newpos, speed): def drip_move(self, newpos, speed):
# Transition to "Flushed" state and then to "Drip" state # Transition from "Flushed"/"Priming"/main state to "Drip" state
self._full_flush() self.move_queue.flush()
self.special_queuing_state = "Drip" self.special_queuing_state = "Drip"
self.need_check_stall = self.reactor.NEVER self.need_check_stall = self.reactor.NEVER
self.reactor.update_timer(self.flush_timer, self.reactor.NEVER) self.reactor.update_timer(self.flush_timer, self.reactor.NEVER)
self.move_queue.set_flush_time(self.buffer_time_high)
self.idle_flush_print_time = 0.
self.drip_completion = self.reactor.completion() self.drip_completion = self.reactor.completion()
# Submit move # Submit move
try: try:
@ -451,7 +453,7 @@ class ToolHead:
except DripModeEndSignal as e: except DripModeEndSignal as e:
self.move_queue.reset() self.move_queue.reset()
self.trapq_free_moves(self.trapq, self.reactor.NEVER) self.trapq_free_moves(self.trapq, self.reactor.NEVER)
# Return to "Flushed" state # Exit "Drip" state
self._full_flush() self._full_flush()
def signal_drip_mode_end(self): def signal_drip_mode_end(self):
self.drip_completion.complete(True) self.drip_completion.complete(True)