altosui: Don't show missing igniter and gps values

The new telemetry stuff leaves state.gps always set (but empty), which
seems fine, we just need to look at state.gps.connected to see if
there's a GPS receiver on board.

For TeleNano, we also want to hide the igniter status fields as they
won't have any data present.

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

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 8a4aa58b02de03234e4d070886ceaf208f84dcb6..d607b0c50aeff986137282c43fa4aeaef2e41da7 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -36,6 +36,18 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                JTextField      value;
                AltosLights     lights;
 
+               void show() {
+                       value.setVisible(true);
+                       lights.setVisible(true);
+                       label.setVisible(true);
+               }
+
+               void hide() {
+                       value.setVisible(false);
+                       lights.setVisible(false);
+                       label.setVisible(false);
+               }
+
                void show(AltosState state, int crc_errors) {}
                void reset() {
                        value.setText("");
@@ -136,14 +148,19 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                void reset() {
                        value.setText("");
                        max_value.setText("");
-                       max = 0;
+                       max = AltosRecord.MISSING;
                }
 
                void show(String format, double v) {
-                       value.setText(String.format(format, v));
-                       if (v > max) {
-                               max_value.setText(String.format(format, v));
-                               max = v;
+                       if (v == AltosRecord.MISSING) {
+                               value.setText("Missing");
+                               max_value.setText("Missing");
+                       } else {
+                               value.setText(String.format(format, v));
+                               if (v > max || max == AltosRecord.MISSING) {
+                                       max_value.setText(String.format(format, v));
+                                       max = v;
+                               }
                        }
                }
                public AscentValueHold (GridBagLayout layout, int y, String text) {
@@ -233,6 +250,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Apogee extends AscentStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4.2f V", state.drogue_sense));
                        lights.set(state.drogue_sense > 3.2);
                }
@@ -245,6 +263,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Main extends AscentStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4.2f V", state.main_sense));
                        lights.set(state.main_sense > 3.2);
                }
@@ -296,7 +315,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
        }
 
        public void show(AltosState state, int crc_errors) {
-               if (state.gps != null) {
+               if (state.gps != null && state.gps.connected) {
                        lat.show(state, crc_errors);
                        lon.show(state, crc_errors);
                } else {
@@ -304,8 +323,14 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                        lon.hide();
                }
                height.show(state, crc_errors);
-               main.show(state, crc_errors);
-               apogee.show(state, crc_errors);
+               if (state.main_sense != AltosRecord.MISSING)
+                       main.show(state, crc_errors);
+               else
+                       main.hide();
+               if (state.drogue_sense != AltosRecord.MISSING)
+                       apogee.show(state, crc_errors);
+               else
+                       apogee.hide();
                speed.show(state, crc_errors);
                accel.show(state, crc_errors);
        }

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index addd687810e4622352df37c3ad987a70b6791a69..2a9e7eef3bf728d834d62b87021da6fd9d71b653 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -258,7 +258,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Lat extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       if (state.gps != null)
+                       if (state.gps != null && state.gps.connected)
                                show(pos(state.gps.lat,"N", "S"));
                        else
                                show("???");
@@ -272,7 +272,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Lon extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       if (state.gps != null)
+                       if (state.gps != null && state.gps.connected)
                                show(pos(state.gps.lon,"W", "E"));
                        else
                                show("???");
@@ -286,6 +286,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Apogee extends DescentStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4.2f V", state.drogue_sense));
                        lights.set(state.drogue_sense > 3.2);
                }
@@ -363,7 +364,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        public void show(AltosState state, int crc_errors) {
                height.show(state, crc_errors);
                speed.show(state, crc_errors);
-               if (state.gps != null) {
+               if (state.gps != null && state.gps.connected) {
                        bearing.show(state, crc_errors);
                        range.show(state, crc_errors);
                        elevation.show(state, crc_errors);
@@ -376,8 +377,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        lat.hide();
                        lon.hide();
                }
-               main.show(state, crc_errors);
-               apogee.show(state, crc_errors);
+               if (state.main_sense != AltosRecord.MISSING)
+                       main.show(state, crc_errors);
+               else
+                       main.hide();
+               if (state.drogue_sense != AltosRecord.MISSING)
+                       apogee.show(state, crc_errors);
+               else
+                       apogee.hide();
        }
 
        public AltosDescent() {

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 5f1fc6788e89b2fde8737364506d267948936283..9536c4bbdf1fef7ad6ae52146822c4cf6f832be4 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -156,8 +156,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
                        // Telemetry format menu
                        telemetries = new JComboBox();
-                       telemetries.addItem("Legacy TeleMetrum");
-                       telemetries.addItem("Split Telemetry");
+                       telemetries.addItem("Original TeleMetrum Telemetry");
+                       telemetries.addItem("Standard AltOS Telemetry");
                        int telemetry = 1;
                        telemetry = AltosPreferences.telemetry(serial);
                        if (telemetry > Altos.ao_telemetry_split)

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index 723f830169f6722298a593cf6ce8f8972bae850b..8ebeaba10760c1de4fd98fda5898ab65caa311f5 100644 (file)
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -107,10 +107,12 @@ public class AltosInfoTable extends JTable {
                info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed);
                info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
                info_add_row(0, "Battery", "%9.2f V", state.battery);
-               info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
-               info_add_row(0, "Main", "%9.2f V", state.main_sense);
+               if (state.drogue_sense != AltosRecord.MISSING)
+                       info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
+               if (state.main_sense != AltosRecord.MISSING)
+                       info_add_row(0, "Main", "%9.2f V", state.main_sense);
                info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
-               if (state.gps == null) {
+               if (state.gps == null || !state.gps.connected) {
                        info_add_row(1, "GPS", "not available");
                } else {
                        if (state.gps_ready)

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 63a2daf602ff091ec46857e4a76090b39f3b40ae..d5c8e4341cc33ad965f0fab3254383ff2075ac5a 100644 (file)
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -99,7 +99,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay {
        class Lat extends LandedValue {
                void show (AltosState state, int crc_errors) {
                        show();
-                       if (state.gps != null)
+                       if (state.gps != null && state.gps.connected)
                                value.setText(pos(state.gps.lat,"N", "S"));
                        else
                                value.setText("???");
@@ -114,7 +114,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay {
        class Lon extends LandedValue {
                void show (AltosState state, int crc_errors) {
                        show();
-                       if (state.gps != null)
+                       if (state.gps != null && state.gps.connected)
                                value.setText(pos(state.gps.lon,"E", "W"));
                        else
                                value.setText("???");
@@ -200,7 +200,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay {
        }
 
        public void show(AltosState state, int crc_errors) {
-               if (state.gps != null) {
+               if (state.gps != null && state.gps.connected) {
                        bearing.show(state, crc_errors);
                        distance.show(state, crc_errors);
                        lat.show(state, crc_errors);

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 2d800e8aae2768ffe64ad2fe11aaa18a55a2566c..d08925be9bc916e8cf9a19e170f3516ce2d8e79f 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -149,6 +149,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class Apogee extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4.2f V", state.drogue_sense));
                        lights.set(state.drogue_sense > 3.2);
                }
@@ -161,6 +162,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class Main extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4.2f V", state.main_sense));
                        lights.set(state.main_sense > 3.2);
                }
@@ -259,10 +261,16 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        public void show(AltosState state, int crc_errors) {
                battery.show(state, crc_errors);
-               apogee.show(state, crc_errors);
-               main.show(state, crc_errors);
+               if (state.drogue_sense == AltosRecord.MISSING)
+                       apogee.hide();
+               else
+                       apogee.show(state, crc_errors);
+               if (state.main_sense == AltosRecord.MISSING)
+                       main.hide();
+               else
+                       main.show(state, crc_errors);
                pad_alt.show(state, crc_errors);
-               if (state.gps != null) {
+               if (state.gps != null && state.gps.connected) {
                        gps_locked.show(state, crc_errors);
                        gps_ready.show(state, crc_errors);
                        pad_lat.show(state, crc_errors);