projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Remove a debug line in AltosVoice
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosVoice.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 8eb08b99dbb62dc08f1d8cebd025b5900bad67d7..adf52dd9ab8f7907bf18fb95ee845ab31079a927 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@
-183,6
+183,9
@@
public class AltosVoice {
if (state == null)
return false;
if (state == null)
return false;
+ if (last_tell_mode != TELL_MODE_FLIGHT)
+ last_flight_tell = TELL_FLIGHT_NONE;
+
if (state.state != last_state && AltosLib.ao_flight_boost <= state.state && state.state <= AltosLib.ao_flight_landed) {
speak(state.state_name());
if (descending(state.state) && !descending(last_state)) {
if (state.state != last_state && AltosLib.ao_flight_boost <= state.state && state.state <= AltosLib.ao_flight_landed) {
speak(state.state_name());
if (descending(state.state) && !descending(last_state)) {
@@
-298,10
+301,6
@@
public class AltosVoice {
else
tell_mode = TELL_MODE_RECOVER;
else
tell_mode = TELL_MODE_RECOVER;
- AltosDebug.debug("last_serial %d serial %d last_mode %d mode %d\n",
- last_tell_serial, tell_serial,
- last_tell_mode, tell_mode);
-
if (tell_mode == TELL_MODE_PAD)
spoken = tell_pad(telem_state, state, from_receiver, receiver);
else if (tell_mode == TELL_MODE_FLIGHT)
if (tell_mode == TELL_MODE_PAD)
spoken = tell_pad(telem_state, state, from_receiver, receiver);
else if (tell_mode == TELL_MODE_FLIGHT)