X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=faa2046980bf96b7460afb1f9c8fe83f00221846;hp=5c771df20816993e6d700f9e481b0eb1a11f0d9f;hb=9c9b35254c693b3ade42b24d1e29eaf31e6ba2aa;hpb=5fd225c3a52445ecdc7c04fac5e3d9a0db177c66

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 5c771df2..faa20469 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -28,6 +28,7 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import altosui.Altos;
 import altosui.AltosSerial;
 import altosui.AltosSerialMonitor;
 import altosui.AltosTelemetry;
@@ -91,8 +92,11 @@ class AltosFlightInfoTableModel extends AbstractTableModel {
 
 	public int getRowCount() { return 20; }
 
+	int	current_row = 0;
+	int	prev_num_rows = 0;
+
 	public Object getValueAt(int row, int col) {
-		if (row >= rows.size())
+		if (row >= prev_num_rows)
 			return "";
 		if (col == 0)
 			return rows.get(row).name;
@@ -100,9 +104,6 @@ class AltosFlightInfoTableModel extends AbstractTableModel {
 			return rows.get(row).value;
 	}
 
-	int	current_row = 0;
-	int	prev_num_rows = 0;
-
 	public void resetRow() {
 		current_row = 0;
 	}
@@ -114,10 +115,9 @@ class AltosFlightInfoTableModel extends AbstractTableModel {
 		current_row++;
 	}
 	public void finish() {
-		if (current_row > prev_num_rows) {
+		if (current_row > prev_num_rows)
 			fireTableRowsInserted(prev_num_rows, current_row - 1);
-			prev_num_rows = current_row;
-		}
+		prev_num_rows = current_row;
 		fireTableDataChanged();
 	}
 }
@@ -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);
@@ -311,13 +309,13 @@ public class AltosUI extends JFrame {
 				info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
 			}
 			info_add_row(1, "GPS date", "%04d-%02d-%02d",
-				       state.gps.gps_time.year,
-				       state.gps.gps_time.month,
-				       state.gps.gps_time.day);
+				       state.gps.year,
+				       state.gps.month,
+				       state.gps.day);
 			info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-				       state.gps.gps_time.hour,
-				       state.gps.gps_time.minute,
-				       state.gps.gps_time.second);
+				       state.gps.hour,
+				       state.gps.minute,
+				       state.gps.second);
 			int	nsat_vis = 0;
 			int	c;
 
@@ -346,7 +344,7 @@ public class AltosUI extends JFrame {
 				return;
 
 			/* reset the landing count once we hear about a new flight */
-			if (state.state < AltosTelemetry.ao_flight_drogue)
+			if (state.state < Altos.ao_flight_drogue)
 				reported_landing = 0;
 
 			/* Shut up once the rocket is on the ground */
@@ -355,7 +353,7 @@ public class AltosUI extends JFrame {
 			}
 
 			/* If the rocket isn't on the pad, then report height */
-			if (state.state > AltosTelemetry.ao_flight_pad) {
+			if (state.state > Altos.ao_flight_pad) {
 				voice.speak("%d meters", (int) (state.height + 0.5));
 			} else {
 				reported_landing = 0;
@@ -368,7 +366,7 @@ public class AltosUI extends JFrame {
 			if (!state.ascent &&
 			    (last ||
 			     System.currentTimeMillis() - state.report_time >= 15000 ||
-			     state.state == AltosTelemetry.ao_flight_landed))
+			     state.state == Altos.ao_flight_landed))
 			{
 				if (Math.abs(state.baro_speed) < 20 && state.height < 100)
 					voice.speak("rocket landed safely");
@@ -403,16 +401,22 @@ public class AltosUI extends JFrame {
 	private void tell(AltosState state, AltosState old_state) {
 		if (old_state == null || old_state.state != state.state) {
 			voice.speak(state.data.state);
-			if ((old_state == null || old_state.state <= AltosTelemetry.ao_flight_boost) &&
-			    state.state > AltosTelemetry.ao_flight_boost) {
+			if ((old_state == null || old_state.state <= Altos.ao_flight_boost) &&
+			    state.state > Altos.ao_flight_boost) {
 				voice.speak("max speed: %d meters per second.",
 					    (int) (state.max_speed + 0.5));
-			} else if ((old_state == null || old_state.state < AltosTelemetry.ao_flight_drogue) &&
-				   state.state >= AltosTelemetry.ao_flight_drogue) {
+			} else if ((old_state == null || old_state.state < Altos.ao_flight_drogue) &&
+				   state.state >= Altos.ao_flight_drogue) {
 				voice.speak("max height: %d meters.",
 					    (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() {
-		new AltosEeprom(AltosUI.this);
+		new AltosEepromDownload(AltosUI.this);
 	}
 
 	/* Create the AltosUI menus