X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosPad.java;h=3a8d04fea365347269d89066d93c642d9ac1f468;hb=6823ad5e48fc0a19791d96f886b5689f88c4311b;hp=2f59e879a38d00e981733b2ab38d6826da8b47ae;hpb=f3e68341f6f5daaf26dd162e4f9a06c29988986a;p=fw%2Faltos

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 2f59e879..3a8d04fe 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -43,15 +43,15 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		}
 
 		public void show() {
-			label.show();
-			value.show();
-			lights.show();
+			label.setVisible(true);
+			value.setVisible(true);
+			lights.setVisible(true);
 		}
 
 		public void hide() {
-			label.hide();
-			value.hide();
-			lights.hide();
+			label.setVisible(false);
+			value.setVisible(false);
+			lights.setVisible(false);
 		}
 
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
@@ -96,13 +96,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		void show(AltosState state, int crc_errors) {}
 
 		void show() {
-			label.show();
-			value.show();
+			label.setVisible(true);
+			value.setVisible(true);
 		}
 
 		void hide() {
-			label.hide();
-			value.hide();
+			label.setVisible(false);
+			value.setVisible(false);
 		}
 
 		void reset() {
@@ -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);
 		}
@@ -171,6 +173,28 @@ 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();
@@ -250,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();
@@ -259,10 +284,17 @@ 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);
+		logging_ready.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);
@@ -293,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);
 	}
 }