From ff96e2e4d66fe6648fac2435486d403033086826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 3 Nov 2014 21:39:49 +0100 Subject: [PATCH] Also interpret lines starting with "!!" as errors from the firmware (see http://reprap.org/wiki/G-code#Replies_from_the_RepRap_machine_to_the_host_computer) --- CHANGELOG.md | 1 + src/octoprint/util/comm.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ff95e3a..8530de58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ * The "Slicing done" notification is now colored green ([#558](https://github.com/foosel/OctoPrint/issues/558)). * File management now supports STL files as first class citizens (including UI adjustments to allow management of uploaded STL files including removal and reslicing) and also allows folders (not yet supported by UI) +* Also interpret lines starting with "!!" as errors ### Bug Fixes diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index f05a777f..7c0af4d7 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -986,7 +986,7 @@ class MachineCom(object): def _handleErrors(self, line): # No matter the state, if we see an error, goto the error state and store the error for reference. - if line.startswith('Error:'): + if line.startswith('Error:') or line.startswith('!!'): #Oh YEAH, consistency. # Marlin reports an MIN/MAX temp error as "Error:x\n: Extruder switched off. MAXTEMP triggered !\n" # But a bed temp error is reported as "Error: Temperature heated bed switched off. MAXTEMP triggered !!"