X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStats.java;h=0be49c2fb82167890ab9da39f363fc2f8c2f0fca;hp=11a3f1a95614029008db612121b670a1919263d9;hb=ea8c9ca9dd24a026ea5bfe5a1ac70857181a88c8;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java
index 11a3f1a9..0be49c2f 100644
--- a/altosui/AltosFlightStats.java
+++ b/altosui/AltosFlightStats.java
@@ -18,10 +18,11 @@
 package altosui;
 
 import java.io.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosFlightStats {
 	double		max_height;
+	double		max_gps_height;
 	double		max_speed;
 	double		max_acceleration;
 	double[]	state_speed = new double[Altos.ao_flight_invalid + 1];
@@ -38,6 +39,9 @@ public class AltosFlightStats {
 	boolean		has_gps;
 	boolean		has_other_adc;
 	boolean		has_rssi;
+	boolean		has_imu;
+	boolean		has_mag;
+	boolean		has_orient;
 
 	double landed_time(AltosStateIterable states) {
 		AltosState state = null;
@@ -84,7 +88,7 @@ public class AltosFlightStats {
 			state = s;
 			if (state.acceleration() < 1)
 				boost_time = state.time;
-			if (state.state >= Altos.ao_flight_boost)
+			if (state.state >= AltosLib.ao_flight_boost && state.state <= AltosLib.ao_flight_landed)
 				break;
 		}
 		if (state == null)
@@ -108,6 +112,9 @@ public class AltosFlightStats {
 		has_gps = false;
 		has_other_adc = false;
 		has_rssi = false;
+		has_imu = false;
+		has_mag = false;
+		has_orient = false;
 		for (AltosState state : states) {
 			if (serial == AltosLib.MISSING && state.serial != AltosLib.MISSING)
 				serial = state.serial;
@@ -118,10 +125,12 @@ public class AltosFlightStats {
 			if (state.rssi != AltosLib.MISSING)
 				has_rssi = true;
 			end_time = state.time;
-			if (state.time >= boost_time && state.state < Altos.ao_flight_boost)
-				state.state = Altos.ao_flight_boost;
-			if (state.time >= landed_time && state.state < Altos.ao_flight_landed)
-				state.state = Altos.ao_flight_landed;
+
+			int state_id = state.state;
+			if (state.time >= boost_time && state_id < Altos.ao_flight_boost)
+				state_id = Altos.ao_flight_boost;
+			if (state.time >= landed_time && state_id < Altos.ao_flight_landed)
+				state_id = Altos.ao_flight_landed;
 			if (state.gps != null && state.gps.locked) {
 				year = state.gps.year;
 				month = state.gps.month;
@@ -130,20 +139,25 @@ public class AltosFlightStats {
 				minute = state.gps.minute;
 				second = state.gps.second;
 			}
-			if (0 <= state.state && state.state < Altos.ao_flight_invalid) {
-				state_accel[state.state] += state.acceleration();
-				state_speed[state.state] += state.speed();
-				state_count[state.state]++;
-				if (state_start[state.state] == 0.0)
-					state_start[state.state] = state.time;
-				if (state_end[state.state] < state.time)
-					state_end[state.state] = state.time;
+			if (0 <= state_id && state_id < Altos.ao_flight_invalid) {
+				double acceleration = state.acceleration();
+				double speed = state.speed();
+				if (acceleration != AltosLib.MISSING && speed != AltosLib.MISSING) {
+					state_accel[state_id] += acceleration;
+					state_speed[state_id] += speed;
+					state_count[state_id]++;
+				}
+				if (state_start[state_id] == 0.0)
+					state_start[state_id] = state.time;
+				if (state_end[state_id] < state.time)
+					state_end[state_id] = state.time;
 				max_height = state.max_height();
 				max_speed = state.max_speed();
 				max_acceleration = state.max_acceleration();
+				max_gps_height = state.max_gps_height();
 			}
 			if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
-				if (state.state <= Altos.ao_flight_pad) {
+				if (state_id <= Altos.ao_flight_pad) {
 					pad_lat = state.gps.lat;
 					pad_lon = state.gps.lon;
 				}
@@ -151,6 +165,12 @@ public class AltosFlightStats {
 				lon = state.gps.lon;
 				has_gps = true;
 			}
+			if (state.imu != null)
+				has_imu = true;
+			if (state.mag != null)
+				has_mag = true;
+			if (state.orient() != AltosLib.MISSING)
+				has_orient = true;
 		}
 		for (int s = Altos.ao_flight_startup; s <= Altos.ao_flight_landed; s++) {
 			if (state_count[s] > 0) {