From: daid <daid303@gmail.com>
Date: Mon, 3 Feb 2014 14:00:13 +0000 (+0100)
Subject: Improve serial autodetection.
X-Git-Tag: 14.02-RC1~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=486861d846d811e8efe268ab69d5ddbc9fe978f3;p=cura.git

Improve serial autodetection.
---

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index 0385f33e..3be02e68 100644
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -312,10 +312,10 @@ class MachineCom(object):
 			try:
 				if self._baudrate == 0:
 					self._log("Connecting to: %s with baudrate: 115200 (fallback)" % (self._port))
-					self._serial = serial.Serial(str(self._port), 115200, timeout=0.1, writeTimeout=10000)
+					self._serial = serial.Serial(str(self._port), 115200, timeout=3, writeTimeout=10000)
 				else:
 					self._log("Connecting to: %s with baudrate: %s (configured)" % (self._port, self._baudrate))
-					self._serial = serial.Serial(str(self._port), self._baudrate, timeout=2, writeTimeout=10000)
+					self._serial = serial.Serial(str(self._port), self._baudrate, timeout=5, writeTimeout=10000)
 			except:
 				self._log("Unexpected error while connecting to serial port: %s %s" % (self._port, getExceptionString()))
 		if self._serial is None:
@@ -325,7 +325,7 @@ class MachineCom(object):
 			port = self._serialDetectList.pop(0)
 			self._log("Connecting to: %s with baudrate: %s (auto)" % (port, baudrate))
 			try:
-				self._serial = serial.Serial(port, baudrate, timeout=0.1, writeTimeout=10000)
+				self._serial = serial.Serial(port, baudrate, timeout=3, writeTimeout=10000)
 			except:
 				pass
 		else:
@@ -403,7 +403,7 @@ class MachineCom(object):
 									self._serialDetectList = serialList(True)
 									baudrate = self._baudrateDetectList.pop(0)
 							self._serial.close()
-							self._serial = serial.Serial(self._serialDetectList.pop(0), baudrate, timeout=0.5, writeTimeout=10000)
+							self._serial = serial.Serial(self._serialDetectList.pop(0), baudrate, timeout=2.5, writeTimeout=10000)
 						else:
 							baudrate = self._baudrateDetectList.pop(0)
 						try:
@@ -508,7 +508,7 @@ class MachineCom(object):
 				pass
 
 	def _readline(self):
-		if self._serial == None:
+		if self._serial is None:
 			return None
 		try:
 			ret = self._serial.readline()