q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made progress calculation more resilient, do not hit printer with commands like a freight train during warm up

master
Gina Häußge 2013-05-22 18:56:02 +02:00
parent 6ce7fed96d
commit fa584d59c5
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
octoprint/printer.py
View File

@ -416,7 +416,10 @@ class Printer():
newProgress = 0.0
else:
newLine = self._comm.getPrintPos()
newProgress = float(newLine) / float(len(self._gcodeList))
if self._gcodeList is not None:
newProgress = float(newLine) / float(len(self._gcodeList))
else:
newProgress = 0.0
self._setProgressData(newProgress, newLine, self._comm.getPrintTime(), self._comm.getPrintTimeRemainingEstimate())

12
octoprint/util/comm.py
View File

@ -637,7 +637,11 @@ class MachineCom(object):
self._sendCommand("M105")
tempRequestTimeout = time.time() + 5
elif self._state == self.STATE_PRINTING:
# Even when printing request the temperture every 5 seconds.
if line == '' and time.time() > timeout:
self._log("Communication timeout during printing, forcing a line")
line = 'ok'
# Even when printing request the temperature every 5 seconds.
if time.time() > tempRequestTimeout:
self._commandQueue.put("M105")
tempRequestTimeout = time.time() + 5
@ -647,13 +651,9 @@ class MachineCom(object):
self._commandQueue.put("M27")
sdStatusRequestTimeout = time.time() + 1
if not self._commandQueue.empty():
if 'ok' in line and not self._commandQueue.empty():
self._sendCommand(self._commandQueue.get())
else:
if line == '' and time.time() > timeout:
self._log("Communication timeout during printing, forcing a line")
line = 'ok'
if 'ok' in line:
timeout = time.time() + 5
if not self._commandQueue.empty():