pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed pause bug when grbl was sending Queue state without an hardware button pressed

Browse source
This commit is contained in:
make-ing 2015-11-13 17:02:04 +01:00
parent 0e041ed4a9
commit 1f2d9f1243
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/octoprint/util/comm_acc2.py
View file

@ -332,11 +332,11 @@ class MachineCom(object):
if self._grbl_state == 'Queue': if self._grbl_state == 'Queue':
if time.time() - self._pause_delay_time > 0.3: if time.time() - self._pause_delay_time > 0.3:
if not self.isPaused(): if not self.isPaused():
self.setPause(True) self.setPause(True, False)
elif self._grbl_state == 'Run' or self._grbl_state == 'Idle': elif self._grbl_state == 'Run' or self._grbl_state == 'Idle':
if time.time() - self._pause_delay_time > 0.3: if time.time() - self._pause_delay_time > 0.3:
if self.isPaused(): if self.isPaused():
self.setPause(False) self.setPause(False, False)
self._update_grbl_pos(line) self._update_grbl_pos(line)
#if self._metricf is not None: #if self._metricf is not None:
# self._metricf.write(line) # self._metricf.write(line)
@ -846,7 +846,7 @@ class MachineCom(object):
eventManager().fire(Events.PRINT_CANCELLED, payload) eventManager().fire(Events.PRINT_CANCELLED, payload)
def setPause(self, pause): def setPause(self, pause, send_cmd=True):
if not self._currentFile: if not self._currentFile:
return return
@ -861,14 +861,16 @@ class MachineCom(object):
self._pauseWaitTimeLost = self._pauseWaitTimeLost + (time.time() - self._pauseWaitStartTime) self._pauseWaitTimeLost = self._pauseWaitTimeLost + (time.time() - self._pauseWaitStartTime)
self._pauseWaitStartTime = None self._pauseWaitStartTime = None
self._pause_delay_time = time.time() self._pause_delay_time = time.time()
self._real_time_commands['cycle_start']=True if send_cmd is True:
self._real_time_commands['cycle_start']=True
self._send_event.set() self._send_event.set()
eventManager().fire(Events.PRINT_RESUMED, payload) eventManager().fire(Events.PRINT_RESUMED, payload)
elif pause and self.isPrinting(): elif pause and self.isPrinting():
if not self._pauseWaitStartTime: if not self._pauseWaitStartTime:
self._pauseWaitStartTime = time.time() self._pauseWaitStartTime = time.time()
self._pause_delay_time = time.time() self._pause_delay_time = time.time()
self._real_time_commands['feed_hold']=True if send_cmd is True:
self._real_time_commands['feed_hold']=True
self._send_event.set() self._send_event.set()
eventManager().fire(Events.PRINT_PAUSED, payload) eventManager().fire(Events.PRINT_PAUSED, payload)