From 39a8e46000fb49e94d2ddf301cf4b6a9ec9d7497 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 2 Nov 2015 09:39:06 +0100 Subject: [PATCH] added pause delay also for setPause(False) --- src/octoprint/util/comm_acc2.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/octoprint/util/comm_acc2.py b/src/octoprint/util/comm_acc2.py index 891f741a..65fbcb7d 100644 --- a/src/octoprint/util/comm_acc2.py +++ b/src/octoprint/util/comm_acc2.py @@ -328,12 +328,13 @@ class MachineCom(object): def _handle_status_report(self, line): self._grbl_state = line[1:].split(',')[0] if self._grbl_state == 'Queue': - if time.time() - self._pause_delay_time > 0.6: + if time.time() - self._pause_delay_time > 0.3: if not self.isPaused(): self.setPause(True) elif self._grbl_state == 'Run' or self._grbl_state == 'Idle': - if self.isPaused(): - self.setPause(False) + if time.time() - self._pause_delay_time > 0.3: + if self.isPaused(): + self.setPause(False) self._update_grbl_pos(line) #if self._metricf is not None: # self._metricf.write(line) @@ -790,6 +791,7 @@ class MachineCom(object): elif pause and self.isPrinting(): if not self._pauseWaitStartTime: self._pauseWaitStartTime = time.time() + self._pause_delay_time = time.time() self._real_time_commands['feed_hold']=True self._send_event.set() eventManager().fire(Events.PRINT_PAUSED, payload)