altosui: remove debug printf in pad pane

[fw/altos] / altosui / AltosPad.java

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index e345e5dafcdd8480ef0a36f1833fc60401bf002b..3a8d04fea365347269d89066d93c642d9ac1f468 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -42,6 +42,18 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        lights.set(false);
                }
 
+               public void show() {
+                       label.setVisible(true);
+                       value.setVisible(true);
+                       lights.setVisible(true);
+               }
+
+               public void hide() {
+                       label.setVisible(false);
+                       value.setVisible(false);
+                       lights.setVisible(false);
+               }
+
                public LaunchStatus (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -83,6 +95,16 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                JTextField      value;
                void show(AltosState state, int crc_errors) {}
 
+               void show() {
+                       label.setVisible(true);
+                       value.setVisible(true);
+               }
+
+               void hide() {
+                       label.setVisible(false);
+                       value.setVisible(false);
+               }
+
                void reset() {
                        value.setText("");
                }
@@ -127,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);
                }
@@ -139,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);
                }
@@ -149,8 +173,31 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        Main main;
 
+       class LoggingReady extends LaunchStatus {
+               void show (AltosState state, int crc_errors) {
+                       show();
+                       if (state.data.flight != 0) {
+                               if (state.data.state <= Altos.ao_flight_pad)
+                                       value.setText("Ready to record");
+                               else if (state.data.state < Altos.ao_flight_landed)
+                                       value.setText("Recording data");
+                               else
+                                       value.setText("Recorded data");
+                       }
+                       else
+                               value.setText("Storage full");
+                       lights.set(state.data.flight != 0);
+               }
+               public LoggingReady (GridBagLayout layout, int y) {
+                       super(layout, y, "On-board Data Logging");
+               }
+       }
+
+       LoggingReady logging_ready;
+
        class GPSLocked extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4d sats", state.gps.nsat));
                        lights.set(state.gps.locked && state.gps.nsat >= 4);
                }
@@ -163,6 +210,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class GPSReady extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        if (state.gps_ready)
                                value.setText("Ready");
                        else
@@ -189,6 +237,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadLat extends LaunchValue {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(pos(state.pad_lat,"N", "S"));
                }
                public PadLat (GridBagLayout layout, int y) {
@@ -200,6 +249,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadLon extends LaunchValue {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(pos(state.pad_lon,"E", "W"));
                }
                public PadLon (GridBagLayout layout, int y) {
@@ -224,6 +274,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                battery.reset();
                apogee.reset();
                main.reset();
+               logging_ready.reset();
                gps_locked.reset();
                gps_ready.reset();
                pad_lat.reset();
@@ -233,13 +284,27 @@ 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);
-               gps_locked.show(state, crc_errors);
-               gps_ready.show(state, crc_errors);
-               pad_lat.show(state, crc_errors);
-               pad_lon.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);
+               logging_ready.show(state, crc_errors);
                pad_alt.show(state, crc_errors);
+               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);
+                       pad_lon.show(state, crc_errors);
+               } else {
+                       gps_locked.hide();
+                       gps_ready.hide();
+                       pad_lat.hide();
+                       pad_lon.hide();
+               }
        }
 
        public AltosPad() {
@@ -260,10 +325,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                battery = new Battery(layout, 0);
                apogee = new Apogee(layout, 1);
                main = new Main(layout, 2);
-               gps_locked = new GPSLocked(layout, 3);
-               gps_ready = new GPSReady(layout, 4);
-               pad_lat = new PadLat(layout, 5);
-               pad_lon = new PadLon(layout, 6);
-               pad_alt = new PadAlt(layout, 7);
+               logging_ready = new LoggingReady(layout, 3);
+               gps_locked = new GPSLocked(layout, 4);
+               gps_ready = new GPSReady(layout, 5);
+               pad_lat = new PadLat(layout, 6);
+               pad_lon = new PadLon(layout, 7);
+               pad_alt = new PadAlt(layout, 8);
        }
 }