altosui: Add extra ignitors to graphable objects

[fw/altos] / altosui / AltosGraphDataPoint.java

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index b2782459d28a16e33b65b760f57c1fe0c694803f..1c11616637c356ac1f67168bbc101f3a51d0db79 100644 (file)
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 
@@ -50,6 +50,9 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
        public static final int data_mag_y = 23;
        public static final int data_mag_z = 24;
        public static final int data_orient = 25;
+       public static final int data_ignitor_0 = 26;
+       public static final int data_ignitor_num = 32;
+       public static final int data_ignitor_max = data_ignitor_0 + data_ignitor_num - 1;
 
        public double x() throws AltosUIDataMissing {
                double  time = state.time_since_boost();
@@ -87,7 +90,7 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
                        break;
                case data_gps_height:
                        y = state.gps_height;
-                       break;  
+                       break;
                case data_gps_nsat_solution:
                        if (state.gps != null)
                                y = state.gps.nsat;
@@ -109,7 +112,7 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
                case data_pressure:
                        y = state.pressure();
                        break;
-                       
+
                case data_accel_x:
                case data_accel_y:
                case data_accel_z:
@@ -161,6 +164,13 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
                case data_orient:
                        y = state.orient();
                        break;
+               default:
+                       if (data_ignitor_0 <= index && index <= data_ignitor_max) {
+                               int ignitor = index - data_ignitor_0;
+                               if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length)
+                                       y = state.ignitor_voltage[ignitor];
+                       }
+                       break;
                }
                if (y == AltosLib.MISSING)
                        throw new AltosUIDataMissing(index);
@@ -186,4 +196,4 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
        public AltosGraphDataPoint (AltosState state) {
                this.state = state;
        }
-}
\ No newline at end of file
+}