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

Ping pong sending to fix acknowledgement errors

Browse source 
Might be a good solution for people affected by #166, #470, #490 until commRefactoring branch is ready for prime time. No solution for #553 since that needs proper queueing and blocking command detection.
This commit is contained in:
Gina Häußge 2015-02-20 18:48:15 +01:00
parent 5af6f0e7cb
commit 9d3dee7bf3
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/octoprint/util/comm.py
View file

@ -982,20 +982,21 @@ class MachineCom(object):
### Operational
elif self._state == self.STATE_OPERATIONAL or self._state == self.STATE_PAUSED:
# if we still have commands to process, process them
if "ok" in line and not self._commandQueue.empty():
self._sendCommand(self._commandQueue.get())
#Request the temperature on comm timeout (every 5 seconds) when we are not printing.
elif line == "" or "wait" in line:
if self._resendDelta is not None:
self._resendNextCommand()
elif self._sendFromQueue(sendChecksum=False):
pass
else:
self._sendCommand("M105")
if line == "":
self.sendCommand("M105")
tempRequestTimeout = getNewTimeout("temperature")
# if we still have commands to process, process them
elif "ok" in line:
if swallowOk:
swallowOk = False
else:
if self._resendDelta is not None:
self._resendNextCommand()
elif self._sendFromQueue():
pass
# resend -> start resend procedure from requested line
elif line.lower().startswith("resend") or line.lower().startswith("rs"):
if settings().get(["feature", "swallowOkAfterResend"]):
@ -1008,25 +1009,26 @@ class MachineCom(object):
self._log("Communication timeout during printing, forcing a line")
line = 'ok'
if self._heatupWaitStartTime is None:
if time.time() > tempRequestTimeout:
self._sendCommand("M105", sendChecksum=True)
tempRequestTimeout = getNewTimeout("temperature")
if self.isSdPrinting() and time.time() > sdStatusRequestTimeout:
self._sendCommand("M27", sendChecksum=True)
sdStatusRequestTimeout = getNewTimeout("sdStatus")
if "ok" in line:
if swallowOk:
swallowOk = False
else:
if self._resendDelta is not None:
self._resendNextCommand()
elif self._sendFromQueue(sendChecksum=True):
pass
else:
self._sendNext()
if self._heatupWaitStartTime is None:
if time.time() > tempRequestTimeout:
self.sendCommand("M105")
tempRequestTimeout = getNewTimeout("temperature")
if self.isSdPrinting() and time.time() > sdStatusRequestTimeout:
self.sendCommand("M27")
sdStatusRequestTimeout = getNewTimeout("sdStatus")
if self._sendFromQueue(sendChecksum=True):
pass
else:
self._sendNext()
elif line.lower().startswith("resend") or line.lower().startswith("rs"):
if settings().get(["feature", "swallowOkAfterResend"]):
swallowOk = True