altosui: Add igniter status to ascent and descent tabs

Monitor igniters during all phases of the flight.

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

diff --git a/ao-tools/altosui/AltosAscent.java b/ao-tools/altosui/AltosAscent.java
index 8e1b6347d5e7a054154633636da4239317f12fca..38ced95eeb3593712a734b643f716e09fa1fed9c 100644 (file)
--- a/ao-tools/altosui/AltosAscent.java
+++ b/ao-tools/altosui/AltosAscent.java
@@ -31,6 +31,53 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 

+       public class AscentStatus {
+               JLabel          label;
+               JTextField      value;
+               AltosLights     lights;
+
+               void show(AltosState state, int crc_errors) {}
+               void reset() {
+                       value.setText("");
+                       lights.set(false);
+               }
+
+               public AscentStatus (GridBagLayout layout, int y, String text) {
+                       GridBagConstraints      c = new GridBagConstraints();
+                       c.weighty = 1;
+
+                       lights = new AltosLights();
+                       c.gridx = 0; c.gridy = y;
+                       c.anchor = GridBagConstraints.CENTER;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
+                       layout.setConstraints(lights, c);
+                       add(lights);
+
+                       label = new JLabel(text);
+                       label.setFont(Altos.label_font);
+                       label.setHorizontalAlignment(SwingConstants.LEFT);
+                       c.gridx = 1; c.gridy = y;
+                       c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
+                       c.anchor = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
+                       layout.setConstraints(label, c);
+                       add(label);
+
+                       value = new JTextField(15);
+                       value.setFont(Altos.value_font);
+                       value.setHorizontalAlignment(SwingConstants.RIGHT);
+                       c.gridx = 2; c.gridy = y;
+                       c.anchor = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.BOTH;
+                       c.weightx = 1;
+                       layout.setConstraints(value, c);
+                       add(value);
+
+               }
+       }
+

        public class AscentValue {
                JLabel          label;
                JTextField      value;
        public class AscentValue {
                JLabel          label;
                JTextField      value;


@@ -173,6 +220,30 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                return String.format("%s %4d° %9.6f", h, deg, min);
        }
 
                return String.format("%s %4d° %9.6f", h, deg, min);
        }
 

+       class Apogee extends AscentStatus {
+               void show (AltosState state, int crc_errors) {
+                       value.setText(String.format("%4.2f V", state.drogue_sense));
+                       lights.set(state.drogue_sense > 3.2);
+               }
+               public Apogee (GridBagLayout layout, int y) {
+                       super(layout, y, "Apogee Igniter Voltage");
+               }
+       }
+
+       Apogee apogee;
+
+       class Main extends AscentStatus {
+               void show (AltosState state, int crc_errors) {
+                       value.setText(String.format("%4.2f V", state.main_sense));
+                       lights.set(state.main_sense > 3.2);
+               }
+               public Main (GridBagLayout layout, int y) {
+                       super(layout, y, "Main Igniter Voltage");
+               }
+       }
+
+       Main main;
+

        class Lat extends AscentValue {
                void show (AltosState state, int crc_errors) {
                        if (state.gps != null)
        class Lat extends AscentValue {
                void show (AltosState state, int crc_errors) {
                        if (state.gps != null)


@@ -204,6 +275,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
        public void reset() {
                lat.reset();
                lon.reset();
        public void reset() {
                lat.reset();
                lon.reset();

+               main.reset();
+               apogee.reset();

                height.reset();
                speed.reset();
                accel.reset();
                height.reset();
                speed.reset();
                accel.reset();


@@ -213,6 +286,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                lat.show(state, crc_errors);
                lon.show(state, crc_errors);
                height.show(state, crc_errors);
                lat.show(state, crc_errors);
                lon.show(state, crc_errors);
                height.show(state, crc_errors);

+               main.show(state, crc_errors);
+               apogee.show(state, crc_errors);

                speed.show(state, crc_errors);
                accel.show(state, crc_errors);
        }
                speed.show(state, crc_errors);
                accel.show(state, crc_errors);
        }


@@ -253,5 +328,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                accel = new Accel(layout, 3);
                lat = new Lat(layout, 4);
                lon = new Lon(layout, 5);
                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);

        }
 }
        }
 }

diff --git a/ao-tools/altosui/AltosDescent.java b/ao-tools/altosui/AltosDescent.java
index ceb78e57dbbc6254c5f13c2aceeae3afc9dbe2fc..aacd2998dc4b0cf09c0ceaebd075b59d08cb025f 100644 (file)
--- a/ao-tools/altosui/AltosDescent.java
+++ b/ao-tools/altosui/AltosDescent.java
@@ -31,6 +31,52 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 

+       public class DescentStatus {
+               JLabel          label;
+               JTextField      value;
+               AltosLights     lights;
+
+               void show(AltosState state, int crc_errors) {}
+               void reset() {
+                       value.setText("");
+                       lights.set(false);
+               }
+
+               public DescentStatus (GridBagLayout layout, int y, String text) {
+                       GridBagConstraints      c = new GridBagConstraints();
+                       c.weighty = 1;
+
+                       lights = new AltosLights();
+                       c.gridx = 0; c.gridy = y;
+                       c.anchor = GridBagConstraints.CENTER;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
+                       layout.setConstraints(lights, c);
+                       add(lights);
+
+                       label = new JLabel(text);
+                       label.setFont(Altos.label_font);
+                       label.setHorizontalAlignment(SwingConstants.LEFT);
+                       c.gridx = 1; c.gridy = y;
+                       c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
+                       c.anchor = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
+                       layout.setConstraints(label, c);
+                       add(label);
+
+                       value = new JTextField(15);
+                       value.setFont(Altos.value_font);
+                       value.setHorizontalAlignment(SwingConstants.RIGHT);
+                       c.gridx = 2; c.gridy = y;
+                       c.anchor = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.BOTH;
+                       c.weightx = 1;
+                       layout.setConstraints(value, c);
+                       add(value);
+
+               }
+       }

        public class DescentValue {
                JLabel          label;
                JTextField      value;
        public class DescentValue {
                JLabel          label;
                JTextField      value;


@@ -44,14 +90,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value.setText(String.format(format, v));
                }
 
                        value.setText(String.format(format, v));
                }
 

-               public DescentValue (GridBagLayout layout, int y, String text) {
+               public DescentValue (GridBagLayout layout, int x, int y, String text) {

                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
 
                        label = new JLabel(text);
                        label.setFont(Altos.label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
 
                        label = new JLabel(text);
                        label.setFont(Altos.label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);

-                       c.gridx = 0; c.gridy = y;
+                       c.gridx = x + 0; c.gridy = y;

                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
                        c.anchor = GridBagConstraints.WEST;
                        c.fill = GridBagConstraints.VERTICAL;
                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
                        c.anchor = GridBagConstraints.WEST;
                        c.fill = GridBagConstraints.VERTICAL;


@@ -59,11 +105,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        layout.setConstraints(label, c);
                        add(label);
 
                        layout.setConstraints(label, c);
                        add(label);
 

-                       value = new JTextField(30);
+                       value = new JTextField(17);

                        value.setFont(Altos.value_font);
                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        value.setFont(Altos.value_font);
                        value.setHorizontalAlignment(SwingConstants.RIGHT);

-                       c.gridx = 1; c.gridy = y;
-                       c.gridwidth = 2;
+                       c.gridx = x + 1; c.gridy = y;

                        c.anchor = GridBagConstraints.WEST;
                        c.fill = GridBagConstraints.BOTH;
                        c.weightx = 1;
                        c.anchor = GridBagConstraints.WEST;
                        c.fill = GridBagConstraints.BOTH;
                        c.weightx = 1;


@@ -76,8 +121,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                void show (AltosState state, int crc_errors) {
                        show("%6.0f m", state.height);
                }
                void show (AltosState state, int crc_errors) {
                        show("%6.0f m", state.height);
                }

-               public Height (GridBagLayout layout, int y) {
-                       super (layout, y, "Height");
+               public Height (GridBagLayout layout, int x, int y) {
+                       super (layout, x, y, "Height");

                }
        }
 
                }
        }
 


@@ -90,8 +135,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                                speed = state.baro_speed;
                        show("%6.0f m/s", speed);
                }
                                speed = state.baro_speed;
                        show("%6.0f m/s", speed);
                }

-               public Speed (GridBagLayout layout, int y) {
-                       super (layout, y, "Speed");
+               public Speed (GridBagLayout layout, int x, int y) {
+                       super (layout, x, y, "Speed");

                }
        }
 
                }
        }
 


@@ -115,8 +160,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        else
                                value.setText("???");
                }
                        else
                                value.setText("???");
                }

-               public Lat (GridBagLayout layout, int y) {
-                       super (layout, y, "Latitude");
+               public Lat (GridBagLayout layout, int x, int y) {
+                       super (layout, x, y, "Latitude");

                }
        }
 
                }
        }
 


@@ -129,13 +174,37 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        else
                                value.setText("???");
                }
                        else
                                value.setText("???");
                }

-               public Lon (GridBagLayout layout, int y) {
-                       super (layout, y, "Longitude");
+               public Lon (GridBagLayout layout, int x, int y) {
+                       super (layout, x, y, "Longitude");

                }
        }
 
        Lon lon;
 
                }
        }
 
        Lon lon;
 

+       class Apogee extends DescentStatus {
+               void show (AltosState state, int crc_errors) {
+                       value.setText(String.format("%4.2f V", state.drogue_sense));
+                       lights.set(state.drogue_sense > 3.2);
+               }
+               public Apogee (GridBagLayout layout, int y) {
+                       super(layout, y, "Apogee Igniter Voltage");
+               }
+       }
+
+       Apogee apogee;
+
+       class Main extends DescentStatus {
+               void show (AltosState state, int crc_errors) {
+                       value.setText(String.format("%4.2f V", state.main_sense));
+                       lights.set(state.main_sense > 3.2);
+               }
+               public Main (GridBagLayout layout, int y) {
+                       super(layout, y, "Main Igniter Voltage");
+               }
+       }
+
+       Main main;
+

        class Bearing {
                JLabel          label;
                JTextField      value;
        class Bearing {
                JLabel          label;
                JTextField      value;


@@ -154,14 +223,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                                value_deg.setText("???");
                        }
                }
                                value_deg.setText("???");
                        }
                }

-               public Bearing (GridBagLayout layout, int y) {
+               public Bearing (GridBagLayout layout, int x, int y) {

                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
 
                        label = new JLabel("Bearing");
                        label.setFont(Altos.label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
 
                        label = new JLabel("Bearing");
                        label.setFont(Altos.label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);

-                       c.gridx = 0; c.gridy = y;
+                       c.gridx = x + 0; c.gridy = y;

                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
                        c.anchor = GridBagConstraints.WEST;
                        c.weightx = 0;
                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
                        c.anchor = GridBagConstraints.WEST;
                        c.weightx = 0;


@@ -172,9 +241,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value = new JTextField(30);
                        value.setFont(Altos.value_font);
                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        value = new JTextField(30);
                        value.setFont(Altos.value_font);
                        value.setHorizontalAlignment(SwingConstants.RIGHT);

-                       c.gridx = 1; c.gridy = y;
+                       c.gridx = x + 1; c.gridy = y;

                        c.anchor = GridBagConstraints.EAST;
                        c.weightx = 1;
                        c.anchor = GridBagConstraints.EAST;
                        c.weightx = 1;

+                       c.gridwidth = 2;

                        c.fill = GridBagConstraints.BOTH;
                        layout.setConstraints(value, c);
                        add(value);
                        c.fill = GridBagConstraints.BOTH;
                        layout.setConstraints(value, c);
                        add(value);


@@ -182,7 +252,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value_deg = new JTextField(5);
                        value_deg.setFont(Altos.value_font);
                        value_deg.setHorizontalAlignment(SwingConstants.RIGHT);
                        value_deg = new JTextField(5);
                        value_deg.setFont(Altos.value_font);
                        value_deg.setHorizontalAlignment(SwingConstants.RIGHT);

-                       c.gridx = 2; c.gridy = y;
+                       c.gridx = x + 3; c.gridy = y;

                        c.anchor = GridBagConstraints.EAST;
                        c.weightx = 1;
                        c.fill = GridBagConstraints.BOTH;
                        c.anchor = GridBagConstraints.EAST;
                        c.weightx = 1;
                        c.fill = GridBagConstraints.BOTH;


@@ -200,8 +270,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        else
                                value.setText("???");
                }
                        else
                                value.setText("???");
                }

-               public Elevation (GridBagLayout layout, int y) {
-                       super (layout, y, "Elevation");
+               public Elevation (GridBagLayout layout, int x, int y) {
+                       super (layout, x, y, "Elevation");

                }
        }
 
                }
        }
 


@@ -211,8 +281,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                void show (AltosState state, int crc_errors) {
                        show("%6.0f m", state.range);
                }
                void show (AltosState state, int crc_errors) {
                        show("%6.0f m", state.range);
                }

-               public Range (GridBagLayout layout, int y) {
-                       super (layout, y, "Range");
+               public Range (GridBagLayout layout, int x, int y) {
+                       super (layout, x, y, "Range");

                }
        }
 
                }
        }
 


@@ -226,6 +296,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                bearing.reset();
                elevation.reset();
                range.reset();
                bearing.reset();
                elevation.reset();
                range.reset();

+               main.reset();
+               apogee.reset();

        }
 
        public void show(AltosState state, int crc_errors) {
        }
 
        public void show(AltosState state, int crc_errors) {


@@ -236,6 +308,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                range.show(state, crc_errors);
                lat.show(state, crc_errors);
                lon.show(state, crc_errors);
                range.show(state, crc_errors);
                lat.show(state, crc_errors);
                lon.show(state, crc_errors);

+               main.show(state, crc_errors);
+               apogee.show(state, crc_errors);

        }
 
        public AltosDescent() {
        }
 
        public AltosDescent() {


@@ -244,12 +318,12 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                setLayout(layout);
 
                /* Elements in descent display */
                setLayout(layout);
 
                /* Elements in descent display */

-               speed = new Speed(layout, 0);
-               height = new Height(layout, 1);
-               bearing = new Bearing(layout, 2);
-               elevation = new Elevation(layout, 3);
-               range = new Range(layout, 4);
-               lat = new Lat(layout, 5);
-               lon = new Lon(layout, 6);
+               speed = new Speed(layout, 0, 0);        height = new Height(layout, 2, 0);
+               elevation = new Elevation(layout, 0, 1); range = new Range(layout, 2, 1);
+               bearing = new Bearing(layout, 0, 2);
+               lat = new Lat(layout, 0, 3);
+               lon = new Lon(layout, 0, 4);
+               apogee = new Apogee(layout, 5);
+               main = new Main(layout, 6);

        }
 }
        }
 }

diff --git a/ao-tools/altosui/AltosPad.java b/ao-tools/altosui/AltosPad.java
index 8b258c7d6149b199c61a0b5876724cc68f82d07d..77289f896a039126d3f008e2673af851e85ed692 100644 (file)
--- a/ao-tools/altosui/AltosPad.java
+++ b/ao-tools/altosui/AltosPad.java
@@ -30,8 +30,6 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;

-       Font            label_font;
-       Font            value_font;

 
        public class LaunchStatus {
                JLabel          label;
 
        public class LaunchStatus {
                JLabel          label;


@@ -57,7 +55,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        add(lights);
 
                        label = new JLabel(text);
                        add(lights);
 
                        label = new JLabel(text);

-                       label.setFont(label_font);
+                       label.setFont(Altos.label_font);

                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        c.gridx = 1; c.gridy = y;
                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        c.gridx = 1; c.gridy = y;
                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);


@@ -68,7 +66,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        add(label);
 
                        value = new JTextField(15);
                        add(label);
 
                        value = new JTextField(15);

-                       value.setFont(value_font);
+                       value.setFont(Altos.value_font);

                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        c.gridx = 2; c.gridy = y;
                        c.anchor = GridBagConstraints.WEST;
                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        c.gridx = 2; c.gridy = y;
                        c.anchor = GridBagConstraints.WEST;


@@ -94,7 +92,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        c.weighty = 1;
 
                        label = new JLabel(text);
                        c.weighty = 1;
 
                        label = new JLabel(text);

-                       label.setFont(label_font);
+                       label.setFont(Altos.label_font);

                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        c.gridx = 1; c.gridy = y;
                        c.anchor = GridBagConstraints.WEST;
                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        c.gridx = 1; c.gridy = y;
                        c.anchor = GridBagConstraints.WEST;


@@ -104,7 +102,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        add(label);
 
                        value = new JTextField(30);
                        add(label);
 
                        value = new JTextField(30);

-                       value.setFont(value_font);
+                       value.setFont(Altos.value_font);

                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        c.gridx = 2; c.gridy = y;
                        c.anchor = GridBagConstraints.EAST;
                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        c.gridx = 2; c.gridy = y;
                        c.anchor = GridBagConstraints.EAST;


@@ -247,8 +245,6 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
        public AltosPad() {
                layout = new GridBagLayout();
 
        public AltosPad() {
                layout = new GridBagLayout();
 

-               label_font = new Font("Dialog", Font.PLAIN, 22);
-               value_font = new Font("Monospaced", Font.PLAIN, 22);

                setLayout(layout);
 
                /* Elements in pad display:
                setLayout(layout);
 
                /* Elements in pad display: