X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=b35bd23a8626f14032344b671dcd91575a385c1a;hp=2d9c832317845545b53ca303634732332faa8363;hb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00;hpb=19243ecc9b5bbdcc069ae24acf1ca807322c84d8

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 2d9c8323..b35bd23a 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -29,7 +29,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		JTextField	value;
 		AltosLights	lights;
 
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
@@ -66,6 +66,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			value.setFont(Altos.value_font);
 		}
 
+		public void set_label(String text) {
+			label.setText(text);
+		}
+		
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -105,7 +109,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	public class LaunchValue {
 		JLabel		label;
 		JTextField	value;
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void show() {
 			label.setVisible(true);
@@ -135,6 +139,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			show(String.format(format, v));
 		}
 
+		public void set_label(String text) {
+			label.setText(text);
+		}
+		
 		void reset() {
 			value.setText("");
 		}
@@ -167,9 +175,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	}
 
 	class Battery extends LaunchStatus {
-		void show (AltosState state, int crc_errors) {
-			show("%4.2f V", state.battery);
-			lights.set(state.battery > 3.7);
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state == null || state.battery_voltage == AltosLib.MISSING)
+				hide();
+			else {
+				show("%4.2f V", state.battery_voltage);
+				lights.set(state.battery_voltage > 3.7);
+			}
 		}
 		public Battery (GridBagLayout layout, int y) {
 			super(layout, y, "Battery Voltage");
@@ -179,9 +191,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	Battery	battery;
 
 	class Apogee extends LaunchStatus {
-		void show (AltosState state, int crc_errors) {
-			show("%4.2f V", state.drogue_sense);
-			lights.set(state.drogue_sense > 3.2);
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state == null || state.apogee_voltage == AltosLib.MISSING)
+				hide();
+			else {
+				show("%4.2f V", state.apogee_voltage);
+				lights.set(state.apogee_voltage > 3.7);
+			}
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -191,9 +207,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	Apogee apogee;
 
 	class Main extends LaunchStatus {
-		void show (AltosState state, int crc_errors) {
-			show("%4.2f V", state.main_sense);
-			lights.set(state.main_sense > 3.2);
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state == null || state.main_voltage == AltosLib.MISSING)
+				hide();
+			else {
+				show("%4.2f V", state.main_voltage);
+				lights.set(state.main_voltage > 3.7);
+			}
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
@@ -203,18 +223,21 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	Main main;
 
 	class LoggingReady extends LaunchStatus {
-		void show (AltosState state, int crc_errors) {
-			if (state.data.flight != 0) {
-				if (state.data.state <= Altos.ao_flight_pad)
-					show("Ready to record");
-				else if (state.data.state < Altos.ao_flight_landed)
-					show("Recording data");
-				else
-					show("Recorded data");
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state == null || state.flight == AltosLib.MISSING) {
+				hide();
+			} else {
+				if (state.flight != 0) {
+					if (state.state <= Altos.ao_flight_pad)
+						show("Ready to record");
+					else if (state.state < Altos.ao_flight_landed)
+						show("Recording data");
+					else
+						show("Recorded data");
+				} else
+					show("Storage full");
+				lights.set(state.flight != 0);
 			}
-			else
-				show("Storage full");
-			lights.set(state.data.flight != 0);
 		}
 		public LoggingReady (GridBagLayout layout, int y) {
 			super(layout, y, "On-board Data Logging");
@@ -224,9 +247,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	LoggingReady logging_ready;
 
 	class GPSLocked extends LaunchStatus {
-		void show (AltosState state, int crc_errors) {
-			show("%4d sats", state.gps.nsat);
-			lights.set(state.gps.locked && state.gps.nsat >= 4);
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state == null || state.gps == null)
+				hide();
+			else {
+				show("%4d sats", state.gps.nsat);
+				lights.set(state.gps.locked && state.gps.nsat >= 4);
+			}
 		}
 		public GPSLocked (GridBagLayout layout, int y) {
 			super (layout, y, "GPS Locked");
@@ -236,12 +263,16 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GPSLocked gps_locked;
 
 	class GPSReady extends LaunchStatus {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps_ready)
-				show("Ready");
-			else
-				show("Waiting %d", state.gps_waiting);
-			lights.set(state.gps_ready);
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state == null || state.gps == null)
+				hide();
+			else {
+				if (state.gps_ready)
+					show("Ready");
+				else
+					show("Waiting %d", state.gps_waiting);
+				lights.set(state.gps_ready);
+			}
 		}
 		public GPSReady (GridBagLayout layout, int y) {
 			super (layout, y, "GPS Ready");
@@ -250,6 +281,22 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	GPSReady gps_ready;
 
+	class ReceiverBattery extends LaunchStatus {
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (listener_state == null || listener_state.battery == AltosLib.MISSING)
+				hide();
+			else {
+				show("%4.2f V", listener_state.battery);
+				lights.set(listener_state.battery > 3.7);
+			}
+		}
+		public ReceiverBattery (GridBagLayout layout, int y) {
+			super(layout, y, "Receiver Battery");
+		}
+	}
+
+	ReceiverBattery	receiver_battery;
+
 	String pos(double p, String pos, String neg) {
 		String	h = pos;
 		if (p < 0) {
@@ -262,8 +309,24 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	}
 
 	class PadLat extends LaunchValue {
-		void show (AltosState state, int crc_errors) {
-			show(pos(state.pad_lat,"N", "S"));
+		void show (AltosState state, AltosListenerState listener_state) {
+			double lat = AltosLib.MISSING;
+			String label = null;
+
+			if (state != null) {
+				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lat != AltosLib.MISSING) {
+					lat = state.gps.lat;
+					label = "Latitude";
+				} else {
+					lat = state.pad_lat;
+					label = "Pad Latitude";
+				}
+			}
+			if (lat != AltosLib.MISSING) {
+				show(pos(lat,"N", "S"));
+				set_label(label);
+			} else
+				hide();
 		}
 		public PadLat (GridBagLayout layout, int y) {
 			super (layout, y, "Pad Latitude");
@@ -273,8 +336,24 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	PadLat pad_lat;
 
 	class PadLon extends LaunchValue {
-		void show (AltosState state, int crc_errors) {
-			show(pos(state.pad_lon,"E", "W"));
+		void show (AltosState state, AltosListenerState listener_state) {
+			double lon = AltosLib.MISSING;
+			String label = null;
+
+			if (state != null) {
+				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lon != AltosLib.MISSING) {
+					lon = state.gps.lon;
+					label = "Longitude";
+				} else {
+					lon = state.pad_lon;
+					label = "Pad Longitude";
+				}
+			}
+			if (lon != AltosLib.MISSING) {
+				show(pos(lon,"E", "W"));
+				set_label(label);
+			} else
+				hide();
 		}
 		public PadLon (GridBagLayout layout, int y) {
 			super (layout, y, "Pad Longitude");
@@ -284,8 +363,24 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	PadLon pad_lon;
 
 	class PadAlt extends LaunchValue {
-		void show (AltosState state, int crc_errors) {
-			show("%4.0f m", state.pad_alt);
+		void show (AltosState state, AltosListenerState listener_state) {
+			double alt = AltosLib.MISSING;
+			String label = null;
+
+			if (state != null) {
+				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.alt != AltosLib.MISSING) {
+					alt = state.gps.alt;
+					label = "Altitude";
+				} else {
+					alt = state.pad_alt;
+					label = "Pad Altitude";
+				}
+			}
+			if (alt != AltosLib.MISSING) {
+				show("%4.0f m", state.gps.alt);
+				set_label(label);
+			} else
+				hide();
 		}
 		public PadAlt (GridBagLayout layout, int y) {
 			super (layout, y, "Pad Altitude");
@@ -301,6 +396,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		logging_ready.reset();
 		gps_locked.reset();
 		gps_ready.reset();
+		receiver_battery.reset();
 		pad_lat.reset();
 		pad_lon.reset();
 		pad_alt.reset();
@@ -313,34 +409,23 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		logging_ready.set_font();
 		gps_locked.set_font();
 		gps_ready.set_font();
+		receiver_battery.set_font();
 		pad_lat.set_font();
 		pad_lon.set_font();
 		pad_alt.set_font();
 	}
 	
-	public void show(AltosState state, int crc_errors) {
-		battery.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 void show(AltosState state, AltosListenerState listener_state) {
+		battery.show(state, listener_state);
+		apogee.show(state, listener_state);
+		main.show(state, listener_state);
+		logging_ready.show(state, listener_state);
+		pad_alt.show(state, listener_state);
+		receiver_battery.show(state, listener_state);
+		gps_locked.show(state, listener_state);
+		gps_ready.show(state, listener_state);
+		pad_lat.show(state, listener_state);
+		pad_lon.show(state, listener_state);
 	}
 
 	public AltosPad() {
@@ -364,8 +449,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		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);
+		receiver_battery = new ReceiverBattery(layout, 6);
+		pad_lat = new PadLat(layout, 7);
+		pad_lon = new PadLon(layout, 8);
+		pad_alt = new PadAlt(layout, 9);
+		show(null, null);
 	}
 }