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

Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

Browse source
This commit is contained in:
Teja 2015-11-02 09:47:38 +01:00
commit 1c4a782618
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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)