X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=3b37a3d4b498fc90a8ba4e47cd1d6a03fd5681d8;hb=5ed88fb72c3e3ecf3333c700d838667db71cfbdc;hp=68c7611f2adab67777f93eb07b18bff56b6e13cb;hpb=f86dac643081987c8994ab57a96640d5e91b342a;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 68c7611f..3b37a3d4 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -38,6 +38,7 @@ public class AltosState {
 	public boolean boost;	/* under power */
 
 	public double	ground_altitude;
+	public double	altitude;
 	public double	height;
 	public double	speed;
 	public double	acceleration;
@@ -82,6 +83,7 @@ public class AltosState {
 		data = cur;
 
 		ground_altitude = data.ground_altitude();
+		altitude = data.raw_altitude();
 		height = data.filtered_height();
 
 		report_time = System.currentTimeMillis();
@@ -160,7 +162,8 @@ public class AltosState {
 				}
 				ngps++;
 			}
-		}
+		} else
+			pad_alt = ground_altitude;
 
 		gps_waiting = MIN_PAD_SAMPLES - npad;
 		if (gps_waiting < 0)
@@ -173,14 +176,14 @@ public class AltosState {
 		boost = (AltosLib.ao_flight_boost == state);
 
 		/* Only look at accelerometer data under boost */
-		if (boost && acceleration > max_acceleration)
+		if (boost && acceleration > max_acceleration && acceleration != AltosRecord.MISSING)
 			max_acceleration = acceleration;
-		if (boost && speed > max_speed)
+		if (boost && speed > max_speed && speed != AltosRecord.MISSING)
 			max_speed = speed;
-		if (boost && baro_speed > max_baro_speed)
+		if (boost && baro_speed > max_baro_speed && baro_speed != AltosRecord.MISSING)
 			max_baro_speed = baro_speed;
 
-		if (height > max_height)
+		if (height > max_height && height != AltosRecord.MISSING)
 			max_height = height;
 		if (data.gps != null) {
 			if (gps == null || !gps.locked || data.gps.locked)