altosui: Add ignitor tab for TeleMega extra ignitors

[fw/altos] / altosui / AltosAscent.java

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index ceba2d1d4fc3c1db32d7b54cd6afa4007f4a1490..36871dd6e23e4867323979685c202ace9fb1e0d2 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -179,7 +179,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                void reset() {
                        value.setText("");
                        max_value.setText("");
-                       max = AltosRecord.MISSING;
+                       max = AltosLib.MISSING;
                }
 
                void set_font() {
@@ -189,17 +189,24 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                }
 
                void show(AltosUnits units, double v) {
-                       if (v == AltosRecord.MISSING) {
+                       if (v == AltosLib.MISSING) {
                                value.setText("Missing");
                                max_value.setText("Missing");
                        } else {
                                value.setText(units.show(8, v));
-                               if (v > max || max == AltosRecord.MISSING) {
+                               if (v > max || max == AltosLib.MISSING) {
                                        max_value.setText(units.show(8, v));
                                        max = v;
                                }
                        }
                }
+
+               void hide() {
+                       label.setVisible(false);
+                       value.setVisible(false);
+                       max_value.setVisible(false);
+               }
+
                public AscentValueHold (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -240,7 +247,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Height extends AscentValueHold {
                void show (AltosState state, AltosListenerState listener_state) {
-                       show(AltosConvert.height, state.height);
+                       show(AltosConvert.height, state.height());
                }
                public Height (GridBagLayout layout, int y) {
                        super (layout, y, "Height");
@@ -251,7 +258,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Speed extends AscentValueHold {
                void show (AltosState state, AltosListenerState listener_state) {
-                       show(AltosConvert.speed, state.speed);
+                       show(AltosConvert.speed, state.speed());
                }
                public Speed (GridBagLayout layout, int y) {
                        super (layout, y, "Speed");
@@ -262,7 +269,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Accel extends AscentValueHold {
                void show (AltosState state, AltosListenerState listener_state) {
-                       show(AltosConvert.accel, state.acceleration);
+                       show(AltosConvert.accel, state.acceleration());
                }
                public Accel (GridBagLayout layout, int y) {
                        super (layout, y, "Acceleration");
@@ -271,6 +278,17 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        Accel   accel;
 
+       class Orient extends AscentValueHold {
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.orient, state.orient());
+               }
+               public Orient (GridBagLayout layout, int y) {
+                       super (layout, y, "Tilt Angle");
+               }
+       }
+
+       Orient  orient;
+
        String pos(double p, String pos, String neg) {
                String  h = pos;
                if (p < 0) {
@@ -285,7 +303,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
        class Apogee extends AscentStatus {
                void show (AltosState state, AltosListenerState listener_state) {
                        show("%4.2f V", state.apogee_voltage);
-                       lights.set(state.apogee_voltage > 3.7);
+                       lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
                }
                public Apogee (GridBagLayout layout, int y) {
                        super(layout, y, "Apogee Igniter Voltage");
@@ -297,7 +315,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
        class Main extends AscentStatus {
                void show (AltosState state, AltosListenerState listener_state) {
                        show("%4.2f V", state.main_voltage);
-                       lights.set(state.main_voltage > 3.7);
+                       lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
                }
                public Main (GridBagLayout layout, int y) {
                        super(layout, y, "Main Igniter Voltage");
@@ -308,7 +326,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Lat extends AscentValue {
                void show (AltosState state, AltosListenerState listener_state) {
-                       if (state.gps != null && state.gps.connected && state.gps.lat != AltosRecord.MISSING)
+                       if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
                                show(pos(state.gps.lat,"N", "S"));
                        else
                                show("???");
@@ -322,7 +340,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Lon extends AscentValue {
                void show (AltosState state, AltosListenerState listener_state) {
-                       if (state.gps != null && state.gps.connected && state.gps.lon != AltosRecord.MISSING)
+                       if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
                                show(pos(state.gps.lon,"E", "W"));
                        else
                                show("???");
@@ -342,6 +360,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                height.reset();
                speed.reset();
                accel.reset();
+               orient.reset();
        }
 
        public void set_font() {
@@ -354,6 +373,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                height.set_font();
                speed.set_font();
                accel.set_font();
+               orient.set_font();
        }
 
        public void show(AltosState state, AltosListenerState listener_state) {
@@ -365,16 +385,20 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                        lon.hide();
                }
                height.show(state, listener_state);
-               if (state.main_voltage != AltosRecord.MISSING)
+               if (state.main_voltage != AltosLib.MISSING)
                        main.show(state, listener_state);
                else
                        main.hide();
-               if (state.apogee_voltage != AltosRecord.MISSING)
+               if (state.apogee_voltage != AltosLib.MISSING)
                        apogee.show(state, listener_state);
                else
                        apogee.hide();
                speed.show(state, listener_state);
                accel.show(state, listener_state);
+               if (state.orient() != AltosLib.MISSING)
+                       orient.show(state, listener_state);
+               else
+                       orient.hide();
        }
 
        public void labels(GridBagLayout layout, int y) {
@@ -410,13 +434,15 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                 * lon
                 * height
                 */
-               labels(layout, 0);
-               height = new Height(layout, 1);
-               speed = new Speed(layout, 2);
-               accel = new Accel(layout, 3);
-               lat = new Lat(layout, 4);
-               lon = new Lon(layout, 5);
-               apogee = new Apogee(layout, 6);
-               main = new Main(layout, 7);
+               int y = 0;
+               labels(layout, y++);
+               height = new Height(layout, y++);
+               speed = new Speed(layout, y++);
+               accel = new Accel(layout, y++);
+               orient = new Orient(layout, y++);
+               lat = new Lat(layout, y++);
+               lon = new Lon(layout, y++);
+               apogee = new Apogee(layout, y++);
+               main = new Main(layout, y++);
        }
 }