X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosPad.java;h=d08925be9bc916e8cf9a19e170f3516ce2d8e79f;hb=11a2bb8e28df7ed87542f2ee726f877971f5d52a;hp=669543472a71ff3074ad823f0e24c562dcc4220e;hpb=3fbefb3eea981d34a09496cf8abf0119de2e35bf;p=fw%2Faltos

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 66954347..d08925be 100644
--- 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);
 		}
@@ -151,8 +175,9 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	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);
+			lights.set(state.gps.locked && state.gps.nsat >= 4);
 		}
 		public GPSLocked (GridBagLayout layout, int y) {
 			super (layout, y, "GPS Locked");
@@ -163,6 +188,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 +215,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 +227,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) {
@@ -233,13 +261,26 @@ 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);
 		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() {