Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
This commit is contained in:
commit
8b20f0a161
2 changed files with 2 additions and 1 deletions
|
|
@ -31,7 +31,7 @@ default_settings = {
|
|||
"timeout": {
|
||||
"detection": 0.5,
|
||||
"connection": 2,
|
||||
"communication": 5,
|
||||
"communication": 10,
|
||||
"temperature": 5,
|
||||
"sdStatus": 1
|
||||
},
|
||||
|
|
|
|||
|
|
@ -786,6 +786,7 @@ class MachineCom(object):
|
|||
and line.strip() != 'ok' and not line.startswith("wait") \
|
||||
and not line.startswith('Resend:') \
|
||||
and line != 'echo:Unknown command:""\n' \
|
||||
and line != "Unsupported statement" \
|
||||
and self.isOperational():
|
||||
self._callback.mcMessage(line)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue