X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosVoice.java;h=c512089f9c1d0fb00e4e058a4e17b66aa966b5ad;hp=df7409c45999099b12d4641bbbc3094d853fc658;hb=ee14ad16c242e8bd7a9d33ebf569211d1490b8e1;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

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");