altosdroid: update to support new state code

[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 df7409c45999099b12d4641bbbc3094d853fc658..c512089f9c1d0fb00e4e058a4e17b66aa966b5ad 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -63,7 +63,7 @@ public class AltosVoice {
 \r
                boolean spoke = false;\r
                if (old_state == null || old_state.state != state.state) {\r
-                       speak(state.data.state());\r
+                       speak(state.state_name());\r
                        if ((old_state == null || old_state.state <= AltosLib.ao_flight_boost) &&\r
                            state.state > AltosLib.ao_flight_boost) {\r
                                speak(String.format("max speed: %d meters per second.", (int) (state.max_speed() + 0.5)));\r
@@ -132,10 +132,10 @@ public class AltosVoice {
                         */\r
                        if (state.state >= AltosLib.ao_flight_drogue &&\r
                            (last ||\r
-                            System.currentTimeMillis() - state.report_time >= 15000 ||\r
+                            System.currentTimeMillis() - state.received_time >= 15000 ||\r
                             state.state == AltosLib.ao_flight_landed))\r
                        {\r
-                               if (Math.abs(state.baro_speed) < 20 && state.height < 100)\r
+                               if (Math.abs(state.speed) < 20 && state.height < 100)\r
                                        speak("rocket landed safely");\r
                                else\r
                                        speak("rocket may have crashed");\r