Merge remote-tracking branch 'origin/master'

Hugo Stephens
2 parents 654dbda9 72f2bf83
Showing 3 changed files with 83 additions and 68 deletions Show diff stats
.gitignore
robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py
robots/little_john/telemetry/code/monitor/serialselect.py
  
 # File automatically generated by some file managers
 .directory
+
 # Blender creates backup copies of files, which needn't be distributed
 *.blend1
+
 # Backup files
 ~*
 # Solidworks log files
 *.log.*
-# Temprary files used for solidworks conversion from creo
+
+# Temporary files used for solidworks conversion from creo
 *.stp
+
+# Python caching
 robots/little_john/telemetry/code/monitor/__pycache__/
+*.pyc
@@ -14,77 +14,13 @@ import numpy
 import os
 import platform
 import sys
+from serialselect import selectserial
  
 from colours import *
-# Who doesn't like cross platform development
-#if platform.system()=='Windows':
-#    targetdevs='COM5'
-#    os='Windows'
-
-devpatterns = ['ttyACM', 'ttyUSB', 'rfcomm']
-targetdevs = []
-if platform.system()=='Windows':
-    com_ports = ['COM%s' % (i + 1) for i in range(256)]
-    for port in com_ports:
-        try:
-            s = serial.Serial(port)
-            s.close()
-            targetdevs.append(port)
-        except (OSError, serial.SerialException):
-            pass
-    os='Windows'    #may be useful
-else:
-    alldevs = os.listdir("/dev/")
-    targetdevs = []
-    for dev in alldevs:
-        for pattern in devpatterns:
-            if pattern in dev:
-                targetdevs.append("/dev/" + dev)
-    os='Other'     #may be useful
-
-
-if len(targetdevs) == 0:
-    print("Sorry, no serial devices found.")
-    print("Exiting...")
-    time.sleep(2)
-    sys.exit()
-elif len(targetdevs) > 1:
-    print("Found multiple serial devices: ")
-    for i, dev in enumerate(targetdevs):
-        print("  " + str(i) + ": " + dev)
-    while True:
-        try:
-            selection = int(input("Please enter your selection (as a digit):\n > "))
-            if selection >= 0 and selection < len(targetdevs):
-                break
-        except KeyboardInterrupt:
-            sys.exit()
-        except:
-            print("Choice unrecognised: please try again:")
-else:
-    if os=='Windows':
-        print("Only found one likely serial device: " + targetdevs[0])
-        selection = 0
-    else:
-        print("Only found one likely serial device: " + dev)
-
-serialport=targetdevs[selection]
-
  
-try:
-    datafeed = serial.Serial(
-    port=serialport,
-    baudrate = 9600,
-    parity=serial.PARITY_NONE,
-    stopbits=serial.STOPBITS_ONE,
-    bytesize=serial.EIGHTBITS,
-    timeout=1
-    )
+datafeed = selectserial()
  
-    print("Sucessfully opened " + serialport + " as data source!")
-except Exception as e:
-    print("Failed to access " + serialport + " because:")
-    print(e)
+if datafeed == None:
     print("Exiting...")
     sys.exit()
  
@@ -0,0 +1,73 @@
+# Module to choose and open a serial port
+# Written as a telemetry tool by:
+# The UoN Robot Wars Project, 2018
+
+def selectserial():
+    import platform
+    import serial
+    import os
+    
+    devpatterns = ['ttyACM', 'ttyUSB', 'rfcomm']
+    targetdevs = []
+    if platform.system()=='Windows':
+        com_ports = ['COM%s' % (i + 1) for i in range(256)]
+        for port in com_ports:
+            try:
+                s = serial.Serial(port)
+                s.close()
+                targetdevs.append(port)
+            except (OSError, serial.SerialException):
+                pass
+        os='Windows'    #may be useful
+    else:
+        alldevs = os.listdir("/dev/")
+        targetdevs = []
+        for dev in alldevs:
+            for pattern in devpatterns:
+                if pattern in dev:
+                    targetdevs.append("/dev/" + dev)
+        os='Other'     #may be useful
+
+    if len(targetdevs) == 0:
+        print("Sorry, no serial devices found.")
+        print("Exiting...")
+        return None
+    elif len(targetdevs) > 1:
+        print("Found multiple serial devices: ")
+        for i, dev in enumerate(targetdevs):
+            print("  " + str(i) + ": " + dev)
+        while True:
+            try:
+                selection = int(input("Please enter your selection (as a digit):\n > "))
+                if selection >= 0 and selection < len(targetdevs):
+                    break
+            except KeyboardInterrupt:
+                sys.exit()
+            except:
+                print("Choice unrecognised: please try again:")
+    else:
+        if os=='Windows':
+            print("Only found one likely serial device: " + targetdevs[0])
+        else:
+            print("Only found one likely serial device: " + targetdevs[0])
+        selection = 0
+
+    serialport=targetdevs[selection]
+
+
+    try:
+        datafeed = serial.Serial(
+        port=serialport,
+        baudrate = 9600,
+        parity=serial.PARITY_NONE,
+        stopbits=serial.STOPBITS_ONE,
+        bytesize=serial.EIGHTBITS,
+        timeout=1
+        )
+
+        print("Sucessfully opened " + serialport + " as data source!")
+        return datafeed
+    except Exception as e:
+        print("Failed to access " + serialport + " because:")
+        print(e)
+        return None