X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDisplayThread.java;h=ab85607d447ebd194916086e6e79200a7d611f88;hb=39fbc4cb1d4c92522c90aa5e36fd62a4827d8306;hp=c894c2d0e4eaea07f3c800a824a1bc53c9b5c48a;hpb=528e2e41112cad8a81bccbb89c3bd202b818a506;p=fw%2Faltos diff --git a/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java index c894c2d0..ab85607d 100644 --- a/altosui/AltosDisplayThread.java +++ b/altosui/AltosDisplayThread.java @@ -21,7 +21,7 @@ import java.awt.*; import javax.swing.*; import java.io.*; import java.text.*; -import org.altusmetrum.altoslib_1.*; +import org.altusmetrum.altoslib_3.*; public class AltosDisplayThread extends Thread { @@ -89,6 +89,7 @@ public class AltosDisplayThread extends Thread { /* If the rocket isn't on the pad, then report height */ if (Altos.ao_flight_drogue <= state.state && state.state < Altos.ao_flight_landed && + state.from_pad != null && state.range >= 0) { voice.speak("Height %s, bearing %s %d, elevation %d, range %s.\n", @@ -154,7 +155,7 @@ public class AltosDisplayThread extends Thread { wait(sleep_time); } } - + report(false); } } catch (InterruptedException ie) {