Merge branch 'hotfix/0.3.4.1'

Author: elcojacobs

brewpiVersion.py

@@ -23,31 +23,31 @@
 def getVersionFromSerial(ser):
     version = None
     retries = 0
-    startTime = time.time()
     oldTimeOut = ser.timeout
     ser.setTimeout(1)
     ser.write('n')  # request version info
-    while True:
+    while retries < 10:
         retry = True
         while 1: # read all lines from serial
-            line = ser.readline()
+            startTime = time.time()
+            try:
+                line = ser.readline()
+            except ser.SerialException as e:
+                pass
             if line:
                 line = asciiToUnicode(line)
                 if line[0] == 'N':
                     data = line.strip('\n')[2:]
                     version = AvrInfo(data)
                     retry = False
                     break
-                if time.time() - startTime >= ser.timeout:
-                    # have read entire buffer, now just reading data as it comes in. Break to prevent an endless loop.
-                    break
-
+            if time.time() - startTime >= ser.timeout:
+                # have read entire buffer, now just reading data as it comes in. Break to prevent an endless loop.
+                break
         if retry:
             ser.write('n')  # request version info
             # time.sleep(1) delay not needed because of blocking (timeout) readline
             retries += 1
-            if retries > 10:
-                break
         else:
             break
     ser.setTimeout(oldTimeOut) # restore previous serial timeout value