diff options
author | Keith Packard <keithp@keithp.com> | 2015-06-23 22:00:33 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2015-06-23 22:00:33 -0700 |
commit | b1b41e0823a60769e7d2d806f4d97ae043d7dae3 (patch) | |
tree | 77cdb5b56c687355182d5543f6818d22a6d78ecb | |
parent | f275e73f42e0aaf1760da99fb93c394320aafb84 (diff) |
altosdroid: Make sure whole flight state is spoken even when no-one is moving
This eliminates the case where much of the flight state wasn't
reported if the tracker or receiver weren't moving.
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java index 9e953ffe..8eb08b99 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java @@ -195,8 +195,8 @@ public class AltosVoice { return true; } - if (last_tell_mode == TELL_MODE_FLIGHT) { - if (time_since_speak() < 10 * 1000 && last_flight_tell == TELL_FLIGHT_TRACK) + if (last_tell_mode == TELL_MODE_FLIGHT && last_flight_tell == TELL_FLIGHT_TRACK) { + if (time_since_speak() < 10 * 1000) return false; if (!target_moved(state) && !receiver_moved(receiver)) return false; |