Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

This commit is contained in:
Teja 2015-09-04 12:23:30 +02:00
commit 85b43b5598

View file

@ -870,9 +870,11 @@ class MachineCom(object):
returnCode = subprocess.call(params)
if returnCode == False:
self._log("successfully flashed new grbl version")
self._openSerial()
else:
self._log("error during flashing of new grbl version")
self._openSerial()
self._changeState(self.STATE_CLOSED_WITH_ERROR)
def _monitor(self):
feedback_controls, feedback_matcher = convert_feedback_controls(settings().get(["controls"]))