Use absolute values for self._serial.timeout, not relative ones
Thanks to @spapadim for spotting thismaster
parent
6d3e3221b8
commit
c9e261df32
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue