Only match "rs"/"resend" on the start of a line, otherwise the wrong lines might be interpreted as resend requests
parent
2261ddf41f
commit
ae09a50fe5
|
@ -692,7 +692,7 @@ class MachineCom(object):
|
||||||
self._sendCommand("M105")
|
self._sendCommand("M105")
|
||||||
tempRequestTimeout = getNewTimeout("communication")
|
tempRequestTimeout = getNewTimeout("communication")
|
||||||
# resend -> start resend procedure from requested line
|
# resend -> start resend procedure from requested line
|
||||||
elif "resend" in line.lower() or "rs" in line:
|
elif line.lower().startswith("resend") or line.lower().startswith("rs"):
|
||||||
self._handleResendRequest(line)
|
self._handleResendRequest(line)
|
||||||
|
|
||||||
### Printing
|
### Printing
|
||||||
|
@ -726,7 +726,7 @@ class MachineCom(object):
|
||||||
self._sendCommand(self._commandQueue.get())
|
self._sendCommand(self._commandQueue.get())
|
||||||
else:
|
else:
|
||||||
self._sendNext()
|
self._sendNext()
|
||||||
elif "resend" in line.lower() or "rs" in line:
|
elif line.lower().startswith("resend") or line.lower().startswith("rs"):
|
||||||
self._handleResendRequest(line)
|
self._handleResendRequest(line)
|
||||||
except:
|
except:
|
||||||
self._logger.exception("Something crashed inside the serial connection loop, please report this in OctoPrint's bug tracker:")
|
self._logger.exception("Something crashed inside the serial connection loop, please report this in OctoPrint's bug tracker:")
|
||||||
|
|
Loading…
Reference in New Issue