diff options
author | Keith Packard <keithp@keithp.com> | 2010-11-10 22:11:21 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-11-10 22:11:21 -0800 |
commit | 5394548fa5c7bdbfcc01e8aa19e93e1cf6345e2a (patch) | |
tree | 5e50323e8eb6bbb21676da20bb3654c3f2910cf0 /ao-tools/altosui/AltosDisplayThread.java | |
parent | 891e629f6ba20654b614f3ca7211a0f1c92670cb (diff) | |
parent | 75f7698b99a661ed17a91748a99699fa6761772a (diff) |
Merge remote branch 'aj/buttonbox' into buttonbox
Diffstat (limited to 'ao-tools/altosui/AltosDisplayThread.java')
-rw-r--r-- | ao-tools/altosui/AltosDisplayThread.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ao-tools/altosui/AltosDisplayThread.java b/ao-tools/altosui/AltosDisplayThread.java index b5b2777e..375965b9 100644 --- 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) { - 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), + 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)); |