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

Fix premature parse stop on M114 and M115 response with ok-prefix

Browse source
This commit is contained in:
Gina Häußge 2016-11-17 17:30:10 +01:00
parent f1a1b851ee
commit d1cb8ca98a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1133,7 +1133,9 @@ class MachineCom(object):
# ok only considered handled if it's alone on the line, might be
# a response to an M105 or an M114
self._handle_ok()
handled = (line == "wait" or line == "ok" or not ("T:" in line or "T0:" in line or "B:" in line or "C:" in line))
needs_further_handling = "T:" in line or "T0:" in line or "B:" in line or "C:" in line or \
"X:" in line or "FIRMWARE_NAME:" in line
handled = (line == "wait" or line == "ok" or not needs_further_handling)
# process resends
elif lower_line.startswith("resend") or lower_line.startswith("rs"):