From 5b70cfb3e50aa5dd5290c10d9c5e901943bf7d4e Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 4 Sep 2015 11:40:22 +0200 Subject: [PATCH] changed error handling of grbl flashing to only flash once and if an error occurs the state is changed to STATE_CLOSED_WITH_ERROR --- src/octoprint/util/comm_acc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index 947c254b..2b7d95d3 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -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"]))