X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDisplayThread.java;h=ab85607d447ebd194916086e6e79200a7d611f88;hb=2f196323a2829f9537f3b339f19478127ffde623;hp=37f6adf9051613ec0686b0564dacfc442e128024;hpb=488a527267decece48e6682e0e0c7fc29cbed329;p=fw%2Faltos diff --git a/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java index 37f6adf9..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_2.*; +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) {