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 3f7c59798b52e001f1c880f8262fbcac82762ffa..c512089f9c1d0fb00e4e058a4e17b66aa966b5ad 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -1,6 +1,6 @@
 /*\r
- * Copyright © 2011 Keith Packard <keithp@keithp.com>\r
- * Copyright © 2012 Mike Beattie <mike@ethernal.org>\r
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>\r
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -21,7 +21,7 @@ package org.altusmetrum.AltosDroid;
 import android.speech.tts.TextToSpeech;\r
 import android.speech.tts.TextToSpeech.OnInitListener;\r
 \r
-import org.altusmetrum.AltosLib.*;\r
+import org.altusmetrum.altoslib_2.*;\r
 \r
 public class AltosVoice {\r
 \r
@@ -38,7 +38,6 @@ public class AltosVoice {
                        public void onInit(int status) {\r
                                if (status == TextToSpeech.SUCCESS) tts_enabled = true;\r
                                if (tts_enabled) {\r
-                                       speak("AltosDroid ready");\r
                                        idle_thread = new IdleThread();\r
                                }\r
                        }\r
@@ -64,10 +63,10 @@ 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
+                               speak(String.format("max speed: %d meters per second.", (int) (state.max_speed() + 0.5)));\r
                                spoke = true;\r
                        } else if ((old_state == null || old_state.state < AltosLib.ao_flight_drogue) &&\r
                                   state.state >= AltosLib.ao_flight_drogue) {\r
@@ -133,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