X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraph.java;h=564bed86855818c1ffa6b2a37e78e652cb998693;hb=35efd4e51ece706234f80c076eb7f4f70c66098d;hp=ef26f4f941c62ad1f2a034434a28b53135636f14;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7;p=fw%2Faltos

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index ef26f4f9..564bed86 100644
--- a/altosui/AltosGraph.java
+++ b/altosui/AltosGraph.java
@@ -150,29 +150,6 @@ class AltosGyroUnits extends AltosUnits {
 	}
 }
 
-class AltosOrientUnits extends AltosUnits {
-
-	public double value(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public double inverse(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "°";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "degrees";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 1;
-	}
-}
-
 class AltosMagUnits extends AltosUnits {
 
 	public double value(double p, boolean imperial_units) {
@@ -231,7 +208,7 @@ public class AltosGraph extends AltosUIGraph {
 	static AltosNsat nsat_units = new AltosNsat();
 	static AltosDbm dbm_units = new AltosDbm();
 	static AltosGyroUnits gyro_units = new AltosGyroUnits();
-	static AltosOrientUnits orient_units = new AltosOrientUnits();
+	static AltosOrient orient_units = new AltosOrient();
 	static AltosMagUnits mag_units = new AltosMagUnits();
 
 	AltosUIAxis	height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
@@ -412,7 +389,18 @@ public class AltosGraph extends AltosUIGraph {
 				  orient_color,
 				  false,
 				  orient_axis);
+		if (stats.num_ignitor > 0) {
+			for (int i = 0; i < stats.num_ignitor; i++)
+				addSeries(AltosIgnitor.ignitor_name(i),
+					  AltosGraphDataPoint.data_ignitor_0 + i,
+					  voltage_units,
+					  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);
 	}
-}
\ No newline at end of file
+}