projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Allow for flight hardware without any ADC values
[fw/altos]
/
telegps
/
TeleGPSDisplayThread.java
diff --git
a/telegps/TeleGPSDisplayThread.java
b/telegps/TeleGPSDisplayThread.java
index 9de33098b46eb7c04a518e180bddecb0c7445215..4d8fdcc97900ce924a2e7b8d95ace8aa69af91d0 100644
(file)
--- 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 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 {
public class TeleGPSDisplayThread extends Thread {
@@
-90,8
+90,6
@@
public class TeleGPSDisplayThread extends Thread {
voice.speak("Height %s.\n",
AltosConvert.height.say(state.height()));
}
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) {
}
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)
report_time = now();
this.notify();
} else if (spoken)
@@
-170,8
+168,10
@@
public class TeleGPSDisplayThread extends Thread {
for (;;) {
try {
state = reader.read();
for (;;) {
try {
state = reader.read();
- if (state == null)
+ if (state == null) {
+ listener_state.running = false;
break;
break;
+ }
reader.update(state);
show_safely();
told = tell();
reader.update(state);
show_safely();
told = tell();