Updating the latest version to run on Windows

Added a couple of ifs, requires a new dependency 'platform'

Updating the latest version to run on Windows
Added a couple of ifs, requires a new dependency 'platform'
Hugo Stephens
1 parent 761c7779
Showing 1 changed file with 61 additions and 51 deletions Show diff stats
robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py
@@ -12,52 +12,58 @@ import pyglet
 import serial
 import numpy
 import os
+import platform
  
 from colours import *
-
-devpatterns = ['ttyACM', 'ttyUSB', 'rfcomm']
-
-alldevs = os.listdir("/dev/")
-targetdevs = []
-for dev in alldevs:
-    for pattern in devpatterns:
-        if pattern in dev:
-            targetdevs.append(dev)
-            
-
-if len(targetdevs) == 0:
-    print("Sorry, no serial devices found.")
-    print("Exiting...")
-elif len(targetdevs) > 1:
-    print("Found multiple serial devices: ")
-    for i, dev in enumerate(targetdevs):
-        print("  " + str(i) + ": /dev/" + 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:
-            exit()
-        except:
-            print("Choice unrecognised: please try again:")
+# Who doesn't like cross platform development
+if platform.system()=='Windows':
+    serialport='COM5'
+    os='Windows'
 else:
-    print("Only found one likely serial device: /dev/" + dev)
-    selection = 0
-
-serialport = "/dev/" + targetdevs[selection]
+    devpatterns = ['ttyACM', 'ttyUSB', 'rfcomm']
+
+    alldevs = os.listdir("/dev/")
+    targetdevs = []
+    for dev in alldevs:
+        for pattern in devpatterns:
+            if pattern in dev:
+                targetdevs.append(dev)
+
+
+    if len(targetdevs) == 0:
+        print("Sorry, no serial devices found.")
+        print("Exiting...")
+    elif len(targetdevs) > 1:
+        print("Found multiple serial devices: ")
+        for i, dev in enumerate(targetdevs):
+            print("  " + str(i) + ": /dev/" + 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:
+                exit()
+            except:
+                print("Choice unrecognised: please try again:")
+    else:
+        print("Only found one likely serial device: /dev/" + dev)
+        selection = 0
+
+    serialport = "/dev/" + targetdevs[selection]
+    os='Other'
  
 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!")
+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!")
 except Exception, e:
     print("Failed to access " + serialport + " because:")
     print(e)
@@ -76,7 +82,7 @@ class Series:
         #   The latter seta of points much be of like nature and share an axis
         #       (time, temperature, xaccel)
         #   would be a meaningless thing to plot on a single graph anyway
-        
+
         self.title = title
         self.xname = xname
         self.yname = yname
@@ -100,24 +106,24 @@ class Plot(pyglet.window.Window):
         self.lines = (10, 8)
         #self.resizable = True
         self.set_caption(self.series.title)
-        
+
     def on_resize(self, width, height):
         """Handle a resize event from the pyglet event loop"""
         self.bounds = ((int(self.width * self.margins[0]), int(self.width * (1 - self.margins[0]))),
                 (int(self.height * self.margins[1]), int(self.height * (1 - self.margins[1]))))
         pyglet.window.Window.on_resize(self, width, height)
-        
+
     def on_draw(self):
         """Draw all the components of the graph"""
         self.drawBackground()
         self.drawHeading()
         self.drawAxis(0)
         self.drawAxis(1)
-        
+
     def drawBackground(self):
         """Draw the graph background, currently a plain colour"""
         pyglet.image.SolidColorImagePattern(WHITE).create_image(self.width, self.height).blit(0, 0)
-        
+
     def drawHeading(self):
         """Draw a title for the graph (duplicated in the window titlebar, if present"""
         heading = pyglet.text.Label(self.series.title, color=BLACK,
@@ -125,12 +131,12 @@ class Plot(pyglet.window.Window):
                             x=self.width/2, y=self.height-(self.margins[1]),
                             anchor_x='center', anchor_y='top')
         heading.draw()
-        
+
     def drawLine(self):
         for n in range(len(data) - 1):
             a, b = data[n], data[n+1]
             pass
-     
+
     def drawAxis(self, axis): # axis=0 is x, 1 is y
         """Draw the gridlines and labels for one axis, specified in the last argument"""
         limita = self.bounds[1-axis][1]
@@ -180,16 +186,20 @@ class Plot(pyglet.window.Window):
                 pyglet.gl.glPopMatrix()
  
             tag.draw()
-        
+
 testseries = Series()
  
-plots = []         
+plots = []
 plots.append(Plot(testseries))
  
 def pollSerial(elapsed):
     """Check serial port for incoming data"""
     # Note: 'elapsed' is time since last call of this function
-    values = datafeed.readline().strip().split(", ")
+    # This works, but it might be better for performance to have two seperate functions, only one of which is run.
+    if os=='Windows':
+        values = datafeed.readline().strip().split(b", ")
+    else:
+        values = datafeed.readline().strip().split(", ")
     testseries.addpoint(values)
  
 # Pyglet looks after the main event loop, but this ensures that data keeps being read in