X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=4994f093dcbfed6eb80e7c9534a2715fea65843a;hp=92c3d0a3f43ccbbb3c3a401b2739adb8bd0713d3;hb=d0fd53bdab2f480cd43b6d7010c2094f4fccda91;hpb=6599e9576c3da9325a1731144c1b8bc4943184c0

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 92c3d0a3..4994f093 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -243,17 +243,15 @@ public class AltosUI extends JFrame {
 			flightInfoModel[i].finish();
 	}
 
-	static final int MIN_PAD_SAMPLES = 10;
-
 	public void show(AltosState state) {
 		flightStatusModel.set(state);
 
 		info_reset();
-		if (state.npad >= MIN_PAD_SAMPLES)
+		if (state.gps_ready)
 			info_add_row(0, "Ground state", "%s", "ready");
 		else
 			info_add_row(0, "Ground state", "wait (%d)",
-				     MIN_PAD_SAMPLES - state.npad);
+				     state.gps_waiting);
 		info_add_row(0, "Rocket state", "%s", state.data.state);
 		info_add_row(0, "Callsign", "%s", state.data.callsign);
 		info_add_row(0, "Rocket serial", "%6d", state.data.serial);
@@ -374,7 +372,7 @@ public class AltosUI extends JFrame {
 					voice.speak("rocket landed safely");
 				else
 					voice.speak("rocket may have crashed");
-				if (state.gps != null)
+				if (state.from_pad != null)
 					voice.speak("bearing %d degrees, range %d meters",
 						    (int) (state.from_pad.bearing + 0.5),
 						    (int) (state.from_pad.distance + 0.5));
@@ -413,6 +411,12 @@ public class AltosUI extends JFrame {
 					    (int) (state.max_height + 0.5));
 			}
 		}
+		if (old_state == null || old_state.gps_ready != state.gps_ready) {
+			if (state.gps_ready)
+				voice.speak("GPS ready");
+			else if (old_state != null)
+				voice.speak("GPS lost");
+		}
 		old_state = state;
 	}
 
@@ -613,7 +617,7 @@ public class AltosUI extends JFrame {
 	 * a TeleDongle over the packet link
 	 */
 	private void SaveFlightData() {
-		AltosEeprom.SaveFlightData(AltosUI.this);
+		new AltosEeprom(AltosUI.this);
 	}
 
 	/* Create the AltosUI menus