altos/stm: Make i2c code handle PCLK1 of 24MHz

[fw/altos] / micropeak / MicroGraph.java

diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index 0071a160ef988a3cc44dfda02279c7aadef0b915..64a43bd8fcb88ae1d6b204776b58cfbcdf9cfeec 100644 (file)
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +23,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -40,12 +41,14 @@ public class MicroGraph extends AltosUIGraph {
        static final private Color height_color = new Color(194,31,31);
        static final private Color speed_color = new Color(31,194,31);
        static final private Color accel_color = new Color(31,31,194);
+       static final private Color state_color = new Color(3,3,3);
 
        public MicroGraph(AltosUIEnable enable) {
                super(enable);
 
-               addSeries(0, "Height", MicroDataPoint.data_height, AltosConvert.height, height_color);
-               addSeries(1, "Speed", MicroDataPoint.data_speed, AltosConvert.speed, speed_color);
-               addSeries(2, "Acceleration", MicroDataPoint.data_accel, AltosConvert.accel, accel_color);
+               addSeries("Height", MicroDataPoint.data_height, AltosConvert.height, height_color);
+               addSeries("Speed", MicroDataPoint.data_speed, AltosConvert.speed, speed_color);
+               addSeries("Acceleration", MicroDataPoint.data_accel, AltosConvert.accel, accel_color);
+               addMarker("State", MicroDataPoint.data_state, state_color);
        }
 }
\ No newline at end of file