projects / fw / altos / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
[fw/altos] / ao-tools / altosui / AltosDescent.java
diff --git a/ao-tools/altosui/AltosDescent.java b/ao-tools/altosui/AltosDescent.java
index b69e36b676440cdfd9afd74ce04436048f384306..aacd2998dc4b0cf09c0ceaebd075b59d08cb025f 100644 (file)
--- a/ao-tools/altosui/AltosDescent.java
+++ b/ao-tools/altosui/AltosDescent.java
@@ -30,9 +30,53 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
-       Font            label_font;
-       Font            value_font;
 
+       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;
@@ -46,26 +90,25 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        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(label_font);
+                       label.setFont(Altos.label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);
-                       c.gridx = 0; c.gridy = y;
-                       c.insets = new Insets(10, 10, 10, 10);
+                       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.weightx = 0;
                        layout.setConstraints(label, c);
                        add(label);
 
-                       value = new JTextField(30);
-                       value.setFont(value_font);
+                       value = new JTextField(17);
+                       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;
@@ -78,8 +121,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                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");
                }
        }
 
@@ -92,8 +135,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                                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");
                }
        }
 
@@ -117,8 +160,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        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");
                }
        }
 
@@ -131,13 +174,37 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        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;
 
+       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;
@@ -156,15 +223,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                                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(label_font);
+                       label.setFont(Altos.label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);
-                       c.gridx = 0; c.gridy = y;
-                       c.insets = new Insets(10, 10, 10, 10);
+                       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.fill = GridBagConstraints.VERTICAL;
@@ -172,19 +239,20 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        add(label);
 
                        value = new JTextField(30);
-                       value.setFont(value_font);
+                       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.gridwidth = 2;
                        c.fill = GridBagConstraints.BOTH;
                        layout.setConstraints(value, c);
                        add(value);
 
                        value_deg = new JTextField(5);
-                       value_deg.setFont(value_font);
+                       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;
@@ -202,8 +270,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        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");
                }
        }
 
@@ -213,8 +281,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                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");
                }
        }
 
@@ -228,6 +296,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                bearing.reset();
                elevation.reset();
                range.reset();
+               main.reset();
+               apogee.reset();
        }
 
        public void show(AltosState state, int crc_errors) {
@@ -238,22 +308,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                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() {
                layout = new GridBagLayout();
 
-               label_font = new Font("Dialog", Font.PLAIN, 24);
-               value_font = new Font("Monospaced", Font.PLAIN, 24);
                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);
        }
 }
AltOS - the operating system for Altus Metrum products