X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphDataPoint.java;h=a0b0925cfb693cb8bec77d9d493191922fd1c913;hp=85a19b00c4c61241a8236756b7f12d479548329d;hb=4ac7797d3efb9cc2d9fae88519f55e40b1050224;hpb=528e2e41112cad8a81bccbb89c3bd202b818a506

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index 85a19b00..a0b0925c 100644
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 
@@ -40,6 +40,24 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 	public static final int data_range = 13;
 	public static final int data_distance = 14;
 	public static final int data_pressure = 15;
+	public static final int data_accel_x = 16;
+	public static final int data_accel_y = 17;
+	public static final int data_accel_z = 18;
+	public static final int data_gyro_x = 19;
+	public static final int data_gyro_y = 20;
+	public static final int data_gyro_z = 21;
+	public static final int data_mag_x = 22;
+	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();
@@ -49,7 +67,7 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 	}
 
 	public double y(int index) throws AltosUIDataMissing {
-		double y = AltosRecord.MISSING;
+		double y = AltosLib.MISSING;
 		switch (index) {
 		case data_height:
 			y = state.height();
@@ -77,7 +95,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;
@@ -99,8 +117,93 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 		case data_pressure:
 			y = state.pressure();
 			break;
+
+		case data_accel_x:
+		case data_accel_y:
+		case data_accel_z:
+		case data_gyro_x:
+		case data_gyro_y:
+		case data_gyro_z:
+			AltosIMU	imu = state.imu;
+			if (imu == null)
+				break;
+			switch (index) {
+			case data_accel_x:
+				y = imu.accel_x;
+				break;
+			case data_accel_y:
+				y = imu.accel_y;
+				break;
+			case data_accel_z:
+				y = imu.accel_z;
+				break;
+			case data_gyro_x:
+				y = imu.gyro_x;
+				break;
+			case data_gyro_y:
+				y = imu.gyro_y;
+				break;
+			case data_gyro_z:
+				y = imu.gyro_z;
+				break;
+			}
+			break;
+		case data_mag_x:
+		case data_mag_y:
+		case data_mag_z:
+			AltosMag	mag = state.mag;
+			if (mag == null)
+				break;
+			switch (index) {
+			case data_mag_x:
+				y = mag.x;
+				break;
+			case data_mag_y:
+				y = mag.y;
+				break;
+			case data_mag_z:
+				y = mag.z;
+				break;
+			}
+			break;
+		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 == AltosRecord.MISSING)
+		if (y == AltosLib.MISSING)
 			throw new AltosUIDataMissing(index);
 		return y;
 	}
@@ -108,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
+}