X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=825306be998559373141bba449553019605fa18c;hb=6827d0a7c59d606ea05387465f1ad4d914babd49;hp=f18bf368c22e3314962cfa3c329cef2c190c12d1;hpb=e747156d0ea4b62eea30a8f486ee105ee35dcaf5;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index f18bf368..825306be 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -54,6 +54,7 @@ public class AltosState {
 	public double	max_baro_speed;
 
 	public AltosGPS	gps;
+	public int gps_sequence;
 
 	public AltosIMU	imu;
 	public AltosMag	mag;
@@ -98,14 +99,16 @@ 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 && altitude != AltosRecord.MISSING && ground_altitude != AltosRecord.MISSING) {
+			if (altitude != AltosRecord.MISSING && ground_altitude != AltosRecord.MISSING) {
 				double	cur_height = altitude - ground_altitude;
-				if (prev_state.height == AltosRecord.MISSING)
+				if (prev_state == null || prev_state.height == AltosRecord.MISSING)
 					height = cur_height;
 				else
 					height = (prev_state.height * 15 + cur_height) / 16.0;
@@ -116,10 +119,8 @@ public class AltosState {
 
 		if (data.kalman_acceleration != AltosRecord.MISSING)
 			acceleration = data.kalman_acceleration;
-		else {
+		else
 			acceleration = data.acceleration();
-			System.out.printf ("data acceleration %g\n", acceleration);
-		}
 		temperature = data.temperature();
 		drogue_sense = data.drogue_voltage();
 		main_sense = data.main_voltage();
@@ -133,6 +134,7 @@ public class AltosState {
 			npad = prev_state.npad;
 			ngps = prev_state.ngps;
 			gps = prev_state.gps;
+			gps_sequence = prev_state.gps_sequence;
 			pad_lat = prev_state.pad_lat;
 			pad_lon = prev_state.pad_lon;
 			pad_alt = prev_state.pad_alt;
@@ -155,40 +157,52 @@ 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;
+			gps_sequence = 0;
 			baro_speed = AltosRecord.MISSING;
 			accel_speed = AltosRecord.MISSING;
-			max_baro_speed = AltosRecord.MISSING;
-			max_accel_speed = AltosRecord.MISSING;
-			max_height = AltosRecord.MISSING;
-			max_acceleration = AltosRecord.MISSING;
+			pad_alt = AltosRecord.MISSING;
+			max_baro_speed = 0;
+			max_accel_speed = 0;
+			max_height = 0;
+			max_acceleration = 0;
 			time_change = 0;
 		}
 
 		time = tick / 100.0;
 
-		if (cur.new_gps && (state < AltosLib.ao_flight_boost)) {
+		if (data.gps != null && data.gps_sequence != gps_sequence && (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)
@@ -215,7 +229,7 @@ public class AltosState {
 				pad_alt = ground_altitude;
 		}
 
-		data.new_gps = false;
+		gps_sequence = data.gps_sequence;
 
 		gps_waiting = MIN_PAD_SAMPLES - npad;
 		if (gps_waiting < 0)
@@ -230,30 +244,27 @@ public class AltosState {
 		/* Only look at accelerometer data under boost */
 		if (boost && acceleration != AltosRecord.MISSING && (max_acceleration == AltosRecord.MISSING || acceleration > max_acceleration))
 			max_acceleration = acceleration;
-		if (boost && accel_speed != AltosRecord.MISSING && (max_accel_speed == AltosRecord.MISSING || accel_speed > max_accel_speed))
+		if (boost && accel_speed != AltosRecord.MISSING && accel_speed > max_accel_speed)
 			max_accel_speed = accel_speed;
-		if (boost && baro_speed != AltosRecord.MISSING && (max_baro_speed == AltosRecord.MISSING || baro_speed > max_baro_speed))
+		if (boost && baro_speed != AltosRecord.MISSING && baro_speed > max_baro_speed)
 			max_baro_speed = baro_speed;
 
-		if (height != AltosRecord.MISSING || (max_height == AltosRecord.MISSING || height > max_height))
+		if (height != AltosRecord.MISSING && height > max_height)
 			max_height = height;
-		if (data.gps != null) {
-			if (gps == null || !gps.locked || data.gps.locked)
-				gps = data.gps;
-			if (ngps > 0 && gps.locked) {
-				from_pad = new AltosGreatCircle(pad_lat, pad_lon, gps.lat, gps.lon);
-			}
-		}
 		elevation = 0;
 		range = -1;
-		if (ngps > 0) {
-			gps_height = gps.alt - pad_alt;
-			if (from_pad != null) {
-				elevation = Math.atan2(height, from_pad.distance) * 180 / Math.PI;
-				range = Math.sqrt(height * height + from_pad.distance * from_pad.distance);
+		gps_height = 0;
+		if (data.gps != null) {
+			gps = data.gps;
+			if (ngps > 0 && gps.locked) {
+				double h = height;
+
+				if (h == AltosRecord.MISSING) h = 0;
+				from_pad = new AltosGreatCircle(pad_lat, pad_lon, 0, gps.lat, gps.lon, h);
+				elevation = from_pad.elevation;
+				range = from_pad.range;
+				gps_height = gps.alt - pad_alt;
 			}
-		} else {
-			gps_height = 0;
 		}
 	}