X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosPad.java;h=a6ac70db5efc9de4d582de91df0f1f7722dfa509;hb=f0216d721ed13f4d3dc608bb6ad8f83732b27c0a;hp=fed009ccaea9a1005eb0cf080683b75936d06041;hpb=de8d9c5630ae46378c50faf97f7d2e97fe139e30;p=fw%2Faltos

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index fed009cc..a6ac70db 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -69,7 +70,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		public void set_label(String text) {
 			label.setText(text);
 		}
-		
+
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -142,7 +143,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		public void set_label(String text) {
 			label.setText(text);
 		}
-		
+
 		void reset() {
 			value.setText("");
 		}
@@ -176,11 +177,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Battery extends LaunchStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.battery_voltage == AltosRecord.MISSING)
+			if (state == null || state.battery_voltage == AltosLib.MISSING)
 				hide();
 			else {
 				show("%4.2f V", state.battery_voltage);
-				lights.set(state.battery_voltage > 3.7);
+				lights.set(state.battery_voltage >= AltosLib.ao_battery_good);
 			}
 		}
 		public Battery (GridBagLayout layout, int y) {
@@ -192,11 +193,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Apogee extends LaunchStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.apogee_voltage == AltosRecord.MISSING)
+			if (state == null || state.apogee_voltage == AltosLib.MISSING)
 				hide();
 			else {
 				show("%4.2f V", state.apogee_voltage);
-				lights.set(state.apogee_voltage > 3.7);
+				lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Apogee (GridBagLayout layout, int y) {
@@ -208,11 +209,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Main extends LaunchStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.main_voltage == AltosRecord.MISSING)
+			if (state == null || state.main_voltage == AltosLib.MISSING)
 				hide();
 			else {
 				show("%4.2f V", state.main_voltage);
-				lights.set(state.main_voltage > 3.7);
+				lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Main (GridBagLayout layout, int y) {
@@ -224,7 +225,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class LoggingReady extends LaunchStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.flight == AltosRecord.MISSING) {
+			if (state == null || state.flight == AltosLib.MISSING) {
 				hide();
 			} else {
 				if (state.flight != 0) {
@@ -283,11 +284,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class ReceiverBattery extends LaunchStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (listener_state == null || listener_state.battery == AltosRecord.MISSING)
+			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);
+				lights.set(listener_state.battery > AltosLib.ao_battery_good);
 			}
 		}
 		public ReceiverBattery (GridBagLayout layout, int y) {
@@ -310,17 +311,23 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadLat extends LaunchValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.gps == null) {
-				hide();
-			} else {
-				if (state.state < AltosLib.ao_flight_pad) {
-					show(pos(state.gps.lat,"N", "S"));
-					set_label("Latitude");
-				} else { 
-					show(pos(state.pad_lat,"N", "S"));
-					set_label("Pad Latitude");
+			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");
@@ -331,17 +338,23 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadLon extends LaunchValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.gps == null) {
-				hide();
-			} else {
-				if (state.state < AltosLib.ao_flight_pad) {
-					show(pos(state.gps.lon,"E", "W"));
-					set_label("Longitude");
-				} else { 
-					show(pos(state.pad_lon,"E", "W"));
-					set_label("Pad Longitude");
+			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");
@@ -352,21 +365,23 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadAlt extends LaunchValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null)
-				hide();
-			else {
-				if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
-					show("%4.0f m", state.gps.alt);
-					set_label("Altitude");
+			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 {
-					if (state.pad_alt == AltosRecord.MISSING)
-						hide();
-					else {
-						show("%4.0f m", state.pad_alt);
-						set_label("Pad Altitude");
-					}
+					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");
@@ -400,7 +415,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		pad_lon.set_font();
 		pad_alt.set_font();
 	}
-	
+
 	public void show(AltosState state, AltosListenerState listener_state) {
 		battery.show(state, listener_state);
 		apogee.show(state, listener_state);