altosui: Make sure packet mode is turned off when the connection fails

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

diff --git a/ao-tools/altosui/AltosDisplayThread.java b/ao-tools/altosui/AltosDisplayThread.java
index b5b2777e7885bbc79071faae7fd4238e0563a446..3e719130a6a7c67475f41d98a8740b9904e66e01 100644 (file)
--- a/ao-tools/altosui/AltosDisplayThread.java
+++ b/ao-tools/altosui/AltosDisplayThread.java
@@ -69,8 +69,10 @@ public class AltosDisplayThread extends Thread {
                            state.state < Altos.ao_flight_landed &&
                            state.range >= 0)
                        {
-                               voice.speak("Height %d, bearing %d, elevation %d, range %d.\n",
+                               voice.speak("Height %d, bearing %s %d, elevation %d, range %d.\n",
                                            (int) (state.height + 0.5),
+                        state.from_pad.bearing_words(
+                            AltosGreatCircle.BEARING_VOICE),
                                            (int) (state.from_pad.bearing + 0.5),
                                            (int) (state.elevation + 0.5),
                                            (int) (state.range + 0.5));
@@ -114,10 +116,6 @@ public class AltosDisplayThread extends Thread {
                }
 
                public void run () {
-
-                       reported_landing = 0;
-                       state = null;
-                       report_interval = 10000;
                        try {
                                for (;;) {
                                        set_report_time();
@@ -157,6 +155,12 @@ public class AltosDisplayThread extends Thread {
                        } else if (spoken)
                                set_report_time();
                }
+
+               public IdleThread() {
+                       state = null;
+                       reported_landing = 0;
+                       report_interval = 10000;
+               }
        }
 
        boolean tell(AltosState state, AltosState old_state) {