From c9e261df32a8a31b8bb498fdddf474fe72fe8e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 5 Jul 2013 16:58:00 +0200 Subject: [PATCH] Use absolute values for self._serial.timeout, not relative ones Thanks to @spapadim for spotting this --- octoprint/util/comm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint/util/comm.py b/octoprint/util/comm.py index ae784fa..184fe4e 100644 --- a/octoprint/util/comm.py +++ b/octoprint/util/comm.py @@ -623,7 +623,7 @@ class MachineCom(object): baudrate = self._baudrateDetectList.pop(0) try: self._serial.baudrate = baudrate - self._serial.timeout = getNewTimeout("detection") + self._serial.timeout = settings().getFloat(["serial", "timeout", "detection"]) self._log("Trying baudrate: %d" % (baudrate)) self._baudrateDetectRetry = 5 self._baudrateDetectTestOk = 0 @@ -640,7 +640,7 @@ class MachineCom(object): self._sendCommand("M105") else: self._sendCommand("M999") - self._serial.timeout = getNewTimeout("connection") + self._serial.timeout = settings().getFloat(["serial", "timeout", "connection"]) self._changeState(self.STATE_OPERATIONAL) if self._sdAvailable: self.refreshSdFiles()