1 files changed, 49 insertions, 27 deletions

diff --git a/ao-tools/altosui/AltosPad.java b/ao-tools/altosui/AltosPad.java
index da047072..77289f89 100644
--- a/ao-tools/altosui/AltosPad.java
+++ b/ao-tools/altosui/AltosPad.java
@@ -30,8 +30,6 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
-	Font		label_font;
-	Font		value_font;
 
 	public class LaunchStatus {
 		JLabel		label;
@@ -46,29 +44,34 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
+			c.weighty = 1;
 
 			lights = new AltosLights();
 			c.gridx = 0; c.gridy = y;
 			c.anchor = GridBagConstraints.CENTER;
-			c.fill = GridBagConstraints.CENTER;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
 			layout.setConstraints(lights, c);
 			add(lights);
 
 			label = new JLabel(text);
-			label.setFont(label_font);
+			label.setFont(Altos.label_font);
 			label.setHorizontalAlignment(SwingConstants.LEFT);
 			c.gridx = 1; c.gridy = y;
-			c.insets = new Insets(10, 10, 10, 10);
+			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
 			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
 			layout.setConstraints(label, c);
 			add(label);
 
 			value = new JTextField(15);
-			value.setFont(value_font);
+			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
 			c.gridx = 2; c.gridy = y;
 			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
 			layout.setConstraints(value, c);
 			add(value);
 
@@ -85,22 +88,26 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		}
 		public LaunchValue (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
+			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
+			c.weighty = 1;
 
 			label = new JLabel(text);
-			label.setFont(label_font);
+			label.setFont(Altos.label_font);
 			label.setHorizontalAlignment(SwingConstants.LEFT);
 			c.gridx = 1; c.gridy = y;
-			c.insets = new Insets(10, 10, 10, 10);
 			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
 			layout.setConstraints(label, c);
 			add(label);
 
 			value = new JTextField(30);
-			value.setFont(value_font);
+			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
 			c.gridx = 2; c.gridy = y;
 			c.anchor = GridBagConstraints.EAST;
-			c.fill = GridBagConstraints.HORIZONTAL;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
 			layout.setConstraints(value, c);
 			add(value);
 		}
@@ -142,17 +149,32 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	Main main;
 
-	class GPS extends LaunchStatus {
+	class GPSLocked extends LaunchStatus {
 		void show (AltosState state, int crc_errors) {
 			value.setText(String.format("%4d sats", state.gps.nsat));
+			lights.set(state.gps.locked);
+		}
+		public GPSLocked (GridBagLayout layout, int y) {
+			super (layout, y, "GPS Locked");
+		}
+	}
+
+	GPSLocked gps_locked;
+
+	class GPSReady extends LaunchStatus {
+		void show (AltosState state, int crc_errors) {
+			if (state.gps_ready)
+				value.setText("Ready");
+			else
+				value.setText(String.format("Waiting %d", state.gps_waiting));
 			lights.set(state.gps_ready);
 		}
-		public GPS (GridBagLayout layout, int y) {
-			super (layout, y, "GPS Status");
+		public GPSReady (GridBagLayout layout, int y) {
+			super (layout, y, "GPS Ready");
 		}
 	}
 
-	GPS gps;
+	GPSReady gps_ready;
 
 	String pos(double p, String pos, String neg) {
 		String	h = pos;
@@ -202,7 +224,8 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		battery.reset();
 		apogee.reset();
 		main.reset();
-		gps.reset();
+		gps_locked.reset();
+		gps_ready.reset();
 		pad_lat.reset();
 		pad_lon.reset();
 		pad_alt.reset();
@@ -212,7 +235,8 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		battery.show(state, crc_errors);
 		apogee.show(state, crc_errors);
 		main.show(state, crc_errors);
-		gps.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);
 		pad_alt.show(state, crc_errors);
@@ -221,27 +245,25 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	public AltosPad() {
 		layout = new GridBagLayout();
 
-		GridBagConstraints	c;
-
-		label_font = new Font("Dialog", Font.PLAIN, 24);
-		value_font = new Font("Monospaced", Font.PLAIN, 24);
 		setLayout(layout);
 
-		c = new GridBagConstraints();
 		/* Elements in pad display:
 		 *
 		 * Battery voltage
 		 * Igniter continuity
-		 * GPS lock status and location
+		 * GPS lock status
+		 * GPS ready status
+		 * GPS location
 		 * Pad altitude
 		 * RSSI
 		 */
 		battery = new Battery(layout, 0);
 		apogee = new Apogee(layout, 1);
 		main = new Main(layout, 2);
-		gps = new GPS(layout, 3);
-		pad_lat = new PadLat(layout, 4);
-		pad_lon = new PadLon(layout, 5);
-		pad_alt = new PadAlt(layout, 6);
+		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);
 	}
 }