3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '15.06'

Browse source 
Conflicts:
	cura/CuraApplication.py
This commit is contained in:
Arjen Hiemstra 2015-07-15 00:38:29 +02:00
commit d659e5b8b8
4 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/USBPrinting/PrinterConnection.py
View file

@ -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)