altosui: rename AltosEeprom -> AltosEepromDownload, split out Altos constants

[fw/altos] / ao-tools / altosui / AltosUI.java

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 92c3d0a3f43ccbbb3c3a401b2739adb8bd0713d3..824e4b5b6af456c64c3bd98cde09d0d4a8a88d98 100644 (file)
--- 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;
@@ -243,17 +244,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);
@@ -346,7 +345,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 +354,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,13 +367,13 @@ 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");
                                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));
@@ -403,16 +402,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 +618,7 @@ public class AltosUI extends JFrame {
         * a TeleDongle over the packet link
         */
        private void SaveFlightData() {
-               AltosEeprom.SaveFlightData(AltosUI.this);
+               new AltosEepromDownload(AltosUI.this);
        }
 
        /* Create the AltosUI menus