diff options
| author | Mike Beattie <mike@ethernal.org> | 2013-09-03 15:10:23 +1200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-09-05 11:42:22 -0700 |
| commit | ee14ad16c242e8bd7a9d33ebf569211d1490b8e1 (patch) | |
| tree | 4bba37bb571389888a741eb62e688464ce9f7fe9 /altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java | |
| parent | 5b976a6651f4eb05d30afc08b9e1f27c7e52ae00 (diff) | |
altosdroid: update to support new state code
Signed-off-by: Mike Beattie <mike@ethernal.org>
Conflicts:
altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java index df7409c4..c512089f 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java @@ -63,7 +63,7 @@ public class AltosVoice { boolean spoke = false;
if (old_state == null || old_state.state != state.state) {
- speak(state.data.state());
+ speak(state.state_name());
if ((old_state == null || old_state.state <= AltosLib.ao_flight_boost) &&
state.state > AltosLib.ao_flight_boost) {
speak(String.format("max speed: %d meters per second.", (int) (state.max_speed() + 0.5)));
@@ -132,10 +132,10 @@ public class AltosVoice { */
if (state.state >= AltosLib.ao_flight_drogue &&
(last ||
- System.currentTimeMillis() - state.report_time >= 15000 ||
+ System.currentTimeMillis() - state.received_time >= 15000 ||
state.state == AltosLib.ao_flight_landed))
{
- if (Math.abs(state.baro_speed) < 20 && state.height < 100)
+ if (Math.abs(state.speed) < 20 && state.height < 100)
speak("rocket landed safely");
else
speak("rocket may have crashed");
|