X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphDataPoint.java;h=06a9b62d0767c35169b5996521b130487d1aba65;hp=e672d1bf4e074c0175be7ca7d1baa9101e3dcc60;hb=f80075be4ebb9c5fe00c24b8c7638fad23267424;hpb=9e18c524fa2d1f648f265b3c3105f5ceacf06c10

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index e672d1bf..06a9b62d 100644
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -17,8 +17,8 @@
 
 package altosui;
 
-import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_4.*;
 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 
@@ -50,6 +50,14 @@ 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_gps_course = 26;
+	public static final int data_gps_ground_speed = 27;
+	public static final int data_gps_climb_rate = 28;
+	public static final int data_ignitor_0 = 29;
+	public static final int data_ignitor_num = 32;
+	public static final int data_ignitor_max = data_ignitor_0 + data_ignitor_num - 1;
+	public static final int data_ignitor_fired_0 = data_ignitor_0 + data_ignitor_num;
+	public static final int data_ignitor_fired_max = data_ignitor_fired_0 + data_ignitor_num - 1;
 
 	public double x() throws AltosUIDataMissing {
 		double	time = state.time_since_boost();
@@ -161,6 +169,39 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 		case data_orient:
 			y = state.orient();
 			break;
+		case data_gps_course:
+			if (state.gps != null)
+				y = state.gps.course;
+			else
+				y = AltosLib.MISSING;
+			break;
+		case data_gps_ground_speed:
+			if (state.gps != null)
+				y = state.gps.ground_speed;
+			else
+				y = AltosLib.MISSING;
+			break;
+		case data_gps_climb_rate:
+			if (state.gps != null)
+				y = state.gps.climb_rate;
+			else
+				y = AltosLib.MISSING;
+			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];
+			} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
+				int ignitor = index - data_ignitor_fired_0;
+				if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
+					if ((state.pyro_fired & (1 << ignitor)) != 0)
+						y = 1;
+					else
+						y = 0;
+				}
+			}
+			break;
 		}
 		if (y == AltosLib.MISSING)
 			throw new AltosUIDataMissing(index);
@@ -170,20 +211,32 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 	public int id(int index) {
 		if (index == data_state) {
 			int s = state.state;
-			if (s < Altos.ao_flight_boost || s > Altos.ao_flight_landed)
-				return -1;
-			return s;
+			if (Altos.ao_flight_boost <= s && s <= Altos.ao_flight_landed)
+				return s;
+		} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
+			int ignitor = index - data_ignitor_fired_0;
+			if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
+				if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
+					if ((state.pyro_fired & (1 << ignitor)) != 0)
+						return 1;
+				}
+			}
 		}
-		return 0;
+		return -1;
 	}
 
 	public String id_name(int index) {
-		if (index == data_state)
+		if (index == data_state) {
 			return state.state_name();
+		} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
+			int ignitor = index - data_ignitor_fired_0;
+			if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length)
+				return AltosIgnitor.ignitor_name(ignitor);
+		}
 		return "";
 	}
 
 	public AltosGraphDataPoint (AltosState state) {
 		this.state = state;
 	}
-}
\ No newline at end of file
+}