X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPSDisplayThread.java;h=4d8fdcc97900ce924a2e7b8d95ace8aa69af91d0;hb=ebe009b9c7c2f4de3405479f800a33b449fcbb1e;hp=9de33098b46eb7c04a518e180bddecb0c7445215;hpb=ae1174317fc476e39077f7dc257ec08709c6b301;p=fw%2Faltos diff --git a/telegps/TeleGPSDisplayThread.java b/telegps/TeleGPSDisplayThread.java index 9de33098..4d8fdcc9 100644 --- a/telegps/TeleGPSDisplayThread.java +++ b/telegps/TeleGPSDisplayThread.java @@ -21,8 +21,8 @@ import java.awt.*; import javax.swing.*; import java.io.*; import java.text.*; -import org.altusmetrum.altoslib_4.*; -import org.altusmetrum.altosuilib_2.*; +import org.altusmetrum.altoslib_9.*; +import org.altusmetrum.altosuilib_9.*; public class TeleGPSDisplayThread extends Thread { @@ -90,8 +90,6 @@ public class TeleGPSDisplayThread extends Thread { voice.speak("Height %s.\n", AltosConvert.height.say(state.height())); } - } else { - voice.speak("Height is unknown.\n"); } } @@ -131,7 +129,7 @@ public class TeleGPSDisplayThread extends Thread { } public synchronized void notice(boolean spoken) { - if (old_state != null && old_state.state != state.state) { + if (old_state != null && old_state.state() != state.state()) { report_time = now(); this.notify(); } else if (spoken) @@ -170,8 +168,10 @@ public class TeleGPSDisplayThread extends Thread { for (;;) { try { state = reader.read(); - if (state == null) + if (state == null) { + listener_state.running = false; break; + } reader.update(state); show_safely(); told = tell();