Demo with two simultaneous plots!

Christopher Stone
1 parent 99dd1cb7
Showing 2 changed files with 34 additions and 30 deletions Show diff stats
telemetry/code/monitor/graph_plotter.py
telemetry/code/robot/analogread_demo/analogread_demo.ino
@@ -19,8 +19,11 @@ red = [1, 0, 0]
 green = [0, 1, 0]
 blue = [0.2, 0.5, 1]
-window = pyglet.window.Window(800, 480, resizable=True)
-window.set_caption("Raw data")
+window0 = pyglet.window.Window(800, 480, resizable=True)
+window0.set_caption("First graph")
+
+window1 = pyglet.window.Window(800, 480, resizable=True)
+window1.set_caption("Second graph")
 starttime = time.time()
@@ -59,32 +62,27 @@ def plotline(target, xdata, ydata, colour):
 xdata = [0]
-ydata = [0]
-ydatasmooth = [0]
-
+y0data = [0]
+y1data = [0]
 def poll_serial(foo):
-    max_points = 250
-    value = datafeed.readline()
+    max_points = 200
+    value0 = datafeed.readline().strip().split(", ")[0]
+    value1 = datafeed.readline().strip().split(", ")[1]
     try:
-        value = float(value)
-        ydata.append(value)
-        if len(ydata) > max_points:
-            del ydata[0]
+        value0 = float(value0)
+        y0data.append(value0)
+        if len(y0data) > max_points:
+            del y0data[0]
+            
+        value1 = float(value1)
+        y1data.append(value1)
+        if len(y1data) > max_points:
+            del y1data[0]
         xdata.append(round(time.time() - starttime, 3))
         if len(xdata) > max_points:
-            del xdata[0]
-            
-        avg = 0;
-        for n in range(0, len(ydata)):
-            weight = (1-float(n/len(ydata)))/max_points
-            avg += weight * ydata[n]
-            
-        ydatasmooth.append(avg)
-        if len(ydatasmooth) > max_points:
-            del ydatasmooth[0]
-            
+            del xdata[0]  
     except:
         pass
@@ -94,12 +92,14 @@ def drawgraph(target, xpoints, ypoints, colour):
     plotline(target, xpoints, ypoints, colour)
     drawgrid(target, 16, 10, [min(xpoints), max(xpoints)], [min(ypoints), max(ypoints)])
-@window.event
+@window0.event
 def on_draw():
-    window.clear()
-    drawgraph(window, xdata, ydata, blue)
+    window0.clear()
+    drawgraph(window0, xdata, y0data, red)
-
-
+@window1.event
+def on_draw():
+    window1.clear()
+    drawgraph(window1, xdata, y1data, green)
 pyglet.app.run()
 \ No newline at end of file
@@ -10,11 +10,15 @@
 void setup() {
   Serial.begin(9600);
-  Serial.println("Hello, World");
   pinMode(13, OUTPUT);
 }
 void loop() {
-  float avalue = analogRead(A0);
-  Serial.println(avalue);
+  float a0value = analogRead(A0);
+  float a7value = analogRead(A7);
+
+  Serial.print(a0value);
+  Serial.print(", ");
+  Serial.println(a7value);
+  delay(20);
 }