diff options
author | Arjen Hiemstra <a.hiemstra@ultimaker.com> | 2015-07-15 01:38:29 +0300 |
---|---|---|
committer | Arjen Hiemstra <a.hiemstra@ultimaker.com> | 2015-07-15 01:38:29 +0300 |
commit | d659e5b8b879fe44de0593c9684614cd2e82d8cf (patch) | |
tree | a4c632728d2a35c642ba64b4f53ad1f303f7b22a /plugins/USBPrinting/PrinterConnection.py | |
parent | 8e6dd2486f5bb6a6153cdc6f91971064ddbd9db3 (diff) | |
parent | c1d8e204b7051561e610bc4d1ad6a6a9391519c4 (diff) |
Merge branch '15.06'
Conflicts:
cura/CuraApplication.py
Diffstat (limited to 'plugins/USBPrinting/PrinterConnection.py')
-rw-r--r-- | plugins/USBPrinting/PrinterConnection.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index b26a7bf4f4..cc4a04c275 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -201,18 +201,18 @@ class PrinterConnection(SignalEmitter): continue # Could not set the baud rate, go to the next time.sleep(1.5) # Ensure that we are not talking to the bootloader. 1.5 sec seems to be the magic number sucesfull_responses = 0 - timeout_time = time.time() + 5 + timeout_time = time.time() + 15 self._serial.write(b"\n") self._sendCommand("M105") # Request temperature, as this should (if baudrate is correct) result in a command with "T:" in it + while timeout_time > time.time(): - line = self._readline() + line = self._readline() if line is None: self.setIsConnected(False) # Something went wrong with reading, could be that close was called. return if b"T:" in line: self._serial.timeout = 0.5 - self._serial.write(b"\n") self._sendCommand("M105") sucesfull_responses += 1 if sucesfull_responses >= self._required_responses_auto_baud: @@ -220,6 +220,8 @@ class PrinterConnection(SignalEmitter): self.setIsConnected(True) Logger.log("i", "Established printer connection on port %s" % self._serial_port) return + + Logger.log("e", "Baud rate detection for %s failed", self._serial_port) self.close() # Unable to connect, wrap up. self.setIsConnected(False) |