Reset GPS ready status when GPS comes unlocked on the pad

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

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 3dfc89527601d52d6bf685b2174b66ca9e75e883..4994f093dcbfed6eb80e7c9534a2715fea65843a 100644 (file)
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -210,6 +210,7 @@ public class AltosUI extends JFrame {
                                System.exit(0);
                        }
                });
+               voice.speak("Rocket flight monitor ready.");
        }
 
        public void info_reset() {
@@ -242,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);
@@ -373,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));
@@ -412,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;
        }
 
@@ -473,7 +478,6 @@ public class AltosUI extends JFrame {
                void close() {
                        serial.close();
                        serial.remove_monitor(telem);
-                       System.out.println("DisplayThread done");
                }
 
                public DeviceThread(AltosSerial s) {
@@ -490,11 +494,13 @@ public class AltosUI extends JFrame {
                        try {
                                serial_line.open(device);
                                DeviceThread thread = new DeviceThread(serial_line);
+                               serial_line.set_channel(AltosPreferences.channel());
                                run_display(thread);
                        } catch (FileNotFoundException ee) {
                                JOptionPane.showMessageDialog(AltosUI.this,
-                                                             device.getPath(),
-                                                             "Cannot open serial port",
+                                                             String.format("Cannot open device \"%s\"",
+                                                                           device.getPath()),
+                                                             "Cannot open target device",
                                                              JOptionPane.ERROR_MESSAGE);
                        } catch (IOException ee) {
                                JOptionPane.showMessageDialog(AltosUI.this,
@@ -611,6 +617,7 @@ public class AltosUI extends JFrame {
         * a TeleDongle over the packet link
         */
        private void SaveFlightData() {
+               new AltosEeprom(AltosUI.this);
        }
 
        /* Create the AltosUI menus
@@ -705,12 +712,26 @@ public class AltosUI extends JFrame {
                        menu.setMnemonic(KeyEvent.VK_V);
                        menubar.add(menu);
 
-                       radioitem = new JRadioButtonMenuItem("Enable Voice");
+                       radioitem = new JRadioButtonMenuItem("Enable Voice", AltosPreferences.voice());
                        radioitem.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
+                                               JRadioButtonMenuItem item = (JRadioButtonMenuItem) e.getSource();
+                                               boolean enabled = item.isSelected();
+                                               AltosPreferences.set_voice(enabled);
+                                               if (enabled)
+                                                       voice.speak_always("Enable voice.");
+                                               else
+                                                       voice.speak_always("Disable voice.");
                                        }
                                });
                        menu.add(radioitem);
+                       item = new JMenuItem("Test Voice",KeyEvent.VK_T);
+                       item.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               voice.speak("That's one small step for man; one giant leap for mankind.");
+                                       }
+                               });
+                       menu.add(item);
                }
 
                // Channel menu
@@ -723,12 +744,13 @@ public class AltosUI extends JFrame {
                        for (int c = 0; c <= 9; c++) {
                                radioitem = new JRadioButtonMenuItem(String.format("Channel %1d (%7.3fMHz)", c,
                                                                                   434.550 + c * 0.1),
-                                                                    c == 0);
+                                                                    c == AltosPreferences.channel());
                                radioitem.setActionCommand(String.format("%d", c));
                                radioitem.addActionListener(new ActionListener() {
                                                public void actionPerformed(ActionEvent e) {
-                                                       System.out.println("Command: " + e.getActionCommand() + " param: " +
-                                                                          e.paramString());
+                                                       int new_channel = Integer.parseInt(e.getActionCommand());
+                                                       AltosPreferences.set_channel(new_channel);
+                                                       serial_line.set_channel(new_channel);
                                                }
                                        });
                                menu.add(radioitem);