From: daid <daid303@gmail.com>
Date: Thu, 11 Jul 2013 09:42:41 +0000 (+0200)
Subject: Small fix for #277 Most likely RepetierFW will cause more issues then just this.
X-Git-Tag: 13.10~121
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2fe62c4e30203642fba0b227ec61c7ce9bc8963b;p=cura.git

Small fix for #277 Most likely RepetierFW will cause more issues then just this.
---

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index bc19cf49..4bae4dc0 100644
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -328,7 +328,7 @@ class MachineCom(object):
 		tempRequestTimeout = timeout
 		while True:
 			line = self._readline()
-			if line == None:
+			if line is None:
 				break
 			
 			#No matter the state, if we see an error, goto the error state and store the error for reference.
@@ -384,7 +384,7 @@ class MachineCom(object):
 							self._testingBaudrate = True
 						except:
 							self._log("Unexpected error while setting baudrate: %d %s" % (baudrate, getExceptionString()))
-				elif 'ok' in line and 'T:' in line:
+				elif 'T:' in line:
 					self._baudrateDetectTestOk += 1
 					if self._baudrateDetectTestOk < 10:
 						self._log("Baudrate test ok: %d" % (self._baudrateDetectTestOk))