From b9665a8af4826d0665f696722f0f06bbe973ba0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 17 Sep 2019 18:00:35 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Don't=20try=20to=20trigger=20M11?= =?UTF-8?q?2=20on=20connection=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Doesn't make sense, we don't HAVE a connection yet. --- src/octoprint/util/comm.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 9ea5d26de1..882ea8e618 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -2779,7 +2779,9 @@ def _trigger_error(self, text, reason, close=True): self._changeState(self.STATE_ERROR) eventManager().fire(Events.ERROR, {"error": self.getErrorString(), "reason": reason}) if close: - if self._send_m112_on_error and not self.isSdPrinting(): + if self._send_m112_on_error and not self.isSdPrinting() and reason not in ("connection", + "autodetect_baudrate", + "autodetect_port"): self._trigger_emergency_stop(close=False) self.close(is_error=True) @@ -3730,11 +3732,11 @@ def _trigger_emergency_stop(self, close=True): if self._printerProfileManager.get_current_or_default()["heatedBed"]: self._do_increment_and_send_with_checksum("M140 S0") - # close to reset host state - error_text = "Closing serial port due to emergency stop M112." - self._log(error_text) - if close: + # close to reset host state + error_text = "Closing serial port due to emergency stop M112." + self._log(error_text) + self._errorValue = error_text self.close(is_error=True)