X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=7baf0eb214cadac7a4361af3ee6370dfc08aa183;hp=e9c973deebcad58faae26e4f4a7b735a9fa877d5;hb=eb3ffd06575ddd0be061aa2717c7075c823ed54e;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index e9c973de..7baf0eb2 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_1.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -176,11 +176,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 +192,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 +208,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 +224,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 +283,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,11 +310,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadLat extends LaunchValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			double lat = AltosRecord.MISSING;
+			double lat = AltosLib.MISSING;
 			String label = null;
 
 			if (state != null) {
-				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lat != AltosRecord.MISSING) {
+				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lat != AltosLib.MISSING) {
 					lat = state.gps.lat;
 					label = "Latitude";
 				} else {
@@ -322,8 +322,8 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 					label = "Pad Latitude";
 				}
 			}
-			if (lat != AltosRecord.MISSING) {
-				show(pos(lat,"E", "W"));
+			if (lat != AltosLib.MISSING) {
+				show(pos(lat,"N", "S"));
 				set_label(label);
 			} else
 				hide();
@@ -337,11 +337,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadLon extends LaunchValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			double lon = AltosRecord.MISSING;
+			double lon = AltosLib.MISSING;
 			String label = null;
 
 			if (state != null) {
-				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lon != AltosRecord.MISSING) {
+				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lon != AltosLib.MISSING) {
 					lon = state.gps.lon;
 					label = "Longitude";
 				} else {
@@ -349,7 +349,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 					label = "Pad Longitude";
 				}
 			}
-			if (lon != AltosRecord.MISSING) {
+			if (lon != AltosLib.MISSING) {
 				show(pos(lon,"E", "W"));
 				set_label(label);
 			} else
@@ -364,11 +364,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadAlt extends LaunchValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			double alt = AltosRecord.MISSING;
+			double alt = AltosLib.MISSING;
 			String label = null;
 
 			if (state != null) {
-				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.alt != AltosRecord.MISSING) {
+				if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.alt != AltosLib.MISSING) {
 					alt = state.gps.alt;
 					label = "Altitude";
 				} else {
@@ -376,7 +376,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 					label = "Pad Altitude";
 				}
 			}
-			if (alt != AltosRecord.MISSING) {
+			if (alt != AltosLib.MISSING) {
 				show("%4.0f m", state.gps.alt);
 				set_label(label);
 			} else