From: Keith Packard <keithp@keithp.com>
Date: Thu, 1 May 2014 05:10:29 +0000 (-0700)
Subject: altosui: Mark TeleMega additional pyro ignitor fired points in graphs
X-Git-Tag: 1.3.2.2~132
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=2cf65d60e1c73dbff0badbe1ee6cb43d75bf803c;ds=sidebyside

altosui: Mark TeleMega additional pyro ignitor fired points in graphs

Add markers to indicate when each additional pyro channel fires

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index f1495676..564bed86 100644
--- a/altosui/AltosGraph.java
+++ b/altosui/AltosGraph.java
@@ -397,6 +397,8 @@ public class AltosGraph extends AltosUIGraph {
 					  main_voltage_color,
 					  false,
 					  voltage_axis);
+			for (int i = 0; i < stats.num_ignitor; i++)
+				addMarker(AltosIgnitor.ignitor_name(i), AltosGraphDataPoint.data_ignitor_fired_0 + i, state_color);
 		}
 
 		setDataSet(dataSet);
diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index 1c116166..a771db53 100644
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -53,6 +53,8 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 	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 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();
@@ -169,6 +171,14 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 				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;
 		}
@@ -183,13 +193,26 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
 			if (s < Altos.ao_flight_boost || s > Altos.ao_flight_landed)
 				return -1;
 			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;
 	}
 
 	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 "";
 	}