X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosState.java;h=f1bcb1c1a67a7e87ee5a3ef4cc70e1ce29c44351;hp=8a3bbd4cee31d039d00caedd15c0a0499eb80780;hb=398c02b945a58634c8932f07df2c2be8438da7d1;hpb=08eb1e3e1abb1aa4f5ea92b781a2ff8f480006c5

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 8a3bbd4c..f1bcb1c1 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -155,30 +155,41 @@ public class AltosState {
 				/* compute barometric speed */
 
 				double height_change = height - prev_state.height;
+
+				double prev_baro_speed = prev_state.baro_speed;
+				if (prev_baro_speed == AltosRecord.MISSING)
+					prev_baro_speed = 0;
+
 				if (time_change > 0)
-					baro_speed = (prev_state.baro_speed * 3 + (height_change / time_change)) / 4.0;
+					baro_speed = (prev_baro_speed * 3 + (height_change / time_change)) / 4.0;
 				else
 					baro_speed = prev_state.baro_speed;
 
+				double prev_accel_speed = prev_state.accel_speed;
+
+				if (prev_accel_speed == AltosRecord.MISSING)
+					prev_accel_speed = 0;
+
 				if (acceleration == AltosRecord.MISSING) {
 					/* Fill in mising acceleration value */
 					accel_speed = baro_speed;
-					if (time_change > 0)
-						acceleration = (accel_speed - prev_state.accel_speed) / time_change;
+
+					if (time_change > 0 && accel_speed != AltosRecord.MISSING)
+						acceleration = (accel_speed - prev_accel_speed) / time_change;
 					else
 						acceleration = prev_state.acceleration;
 				} else {
 					/* compute accelerometer speed */
-					accel_speed = prev_state.accel_speed + acceleration * time_change;
+					accel_speed = prev_accel_speed + acceleration * time_change;
 				}
 			}
-
 		} else {
 			npad = 0;
 			ngps = 0;
 			gps = null;
 			baro_speed = AltosRecord.MISSING;
 			accel_speed = AltosRecord.MISSING;
+			pad_alt = AltosRecord.MISSING;
 			max_baro_speed = 0;
 			max_accel_speed = 0;
 			max_height = 0;