projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add compass bearing to voice output
[fw/altos]
/
ao-tools
/
altosui
/
AltosDisplayThread.java
diff --git
a/ao-tools/altosui/AltosDisplayThread.java
b/ao-tools/altosui/AltosDisplayThread.java
index b5b2777e7885bbc79071faae7fd4238e0563a446..375965b904d68364e495a3c2081ab0de46dbad64 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)
{
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),
(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));
(int) (state.from_pad.bearing + 0.5),
(int) (state.elevation + 0.5),
(int) (state.range + 0.5));