X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altoslib%2FAltosState.java;h=8a3bbd4cee31d039d00caedd15c0a0499eb80780;hb=67b8bdb4ea8c22688d4f18416593346585595cfa;hp=4f59c840c4f6d02acc8e862a27578b9ed4534c0a;hpb=1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 4f59c840..8a3bbd4c 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
 public class AltosState {
 	public AltosRecord data;
@@ -98,12 +98,20 @@ public class AltosState {
 		ground_altitude = data.ground_altitude();
 
 		altitude = data.altitude();
+		if (altitude == AltosRecord.MISSING && data.gps != null)
+			altitude = data.gps.alt;
 
+		height = AltosRecord.MISSING;
 		if (data.kalman_height != AltosRecord.MISSING)
 			height = data.kalman_height;
 		else {
-			if (prev_state != null)
-				height = (prev_state.height * 15 + altitude - ground_altitude) / 16.0;
+			if (altitude != AltosRecord.MISSING && ground_altitude != AltosRecord.MISSING) {
+				double	cur_height = altitude - ground_altitude;
+				if (prev_state == null || prev_state.height == AltosRecord.MISSING)
+					height = cur_height;
+				else
+					height = (prev_state.height * 15 + cur_height) / 16.0;
+			}
 		}
 
 		report_time = System.currentTimeMillis();
@@ -169,16 +177,18 @@ public class AltosState {
 			npad = 0;
 			ngps = 0;
 			gps = null;
-			baro_speed = 0;
-			accel_speed = 0;
+			baro_speed = AltosRecord.MISSING;
+			accel_speed = AltosRecord.MISSING;
+			max_baro_speed = 0;
+			max_accel_speed = 0;
+			max_height = 0;
+			max_acceleration = 0;
 			time_change = 0;
-			if (acceleration == AltosRecord.MISSING)
-				acceleration = 0;
 		}
 
 		time = tick / 100.0;
 
-		if (cur.new_gps && (state == AltosLib.ao_flight_pad || state == AltosLib.ao_flight_idle)) {
+		if (cur.new_gps && (state < AltosLib.ao_flight_boost)) {
 
 			/* Track consecutive 'good' gps reports, waiting for 10 of them */
 			if (data.gps != null && data.gps.locked && data.gps.nsat >= 4)
@@ -188,7 +198,7 @@ public class AltosState {
 
 			/* Average GPS data while on the pad */
 			if (data.gps != null && data.gps.locked && data.gps.nsat >= 4) {
-				if (ngps > 1) {
+				if (ngps > 1 && state == AltosLib.ao_flight_pad) {
 					/* filter pad position */
 					pad_lat = (pad_lat * 31.0 + data.gps.lat) / 32.0;
 					pad_lon = (pad_lon * 31.0 + data.gps.lon) / 32.0;
@@ -201,10 +211,12 @@ public class AltosState {
 				ngps++;
 			}
 		} else {
-			if (ngps == 0)
+			if (ngps == 0 && ground_altitude != AltosRecord.MISSING)
 				pad_alt = ground_altitude;
 		}
 
+		data.new_gps = false;
+
 		gps_waiting = MIN_PAD_SAMPLES - npad;
 		if (gps_waiting < 0)
 			gps_waiting = 0;
@@ -216,14 +228,14 @@ public class AltosState {
 		boost = (AltosLib.ao_flight_boost == state);
 
 		/* Only look at accelerometer data under boost */
-		if (boost && acceleration > max_acceleration && acceleration != AltosRecord.MISSING)
+		if (boost && acceleration != AltosRecord.MISSING && (max_acceleration == AltosRecord.MISSING || acceleration > max_acceleration))
 			max_acceleration = acceleration;
-		if (boost && accel_speed > max_accel_speed && accel_speed != AltosRecord.MISSING)
+		if (boost && accel_speed != AltosRecord.MISSING && accel_speed > max_accel_speed)
 			max_accel_speed = accel_speed;
-		if (boost && baro_speed > max_baro_speed && baro_speed != AltosRecord.MISSING)
+		if (boost && baro_speed != AltosRecord.MISSING && baro_speed > max_baro_speed)
 			max_baro_speed = baro_speed;
 
-		if (height > max_height && height != AltosRecord.MISSING)
+		if (height != AltosRecord.MISSING && height > max_height)
 			max_height = height;
 		if (data.gps != null) {
 			if (gps == null || !gps.locked || data.gps.locked)