X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=744c58483b9b692e2e610f72e993a3bb7318099a;hp=a6c149080171c3087e9e08a5627a6a1fbba578ab;hb=15e3f2dae15e41a8501e3e1d221536751af15f94;hpb=7ce82ea72009f7c9ac09be08aec154aec606d3c9

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index a6c14908..744c5848 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -30,6 +30,8 @@ public class AltosFlightStats {
 	public int[]		state_count = new int[AltosLib.ao_flight_invalid + 1];
 	public double[]	state_start = new double[AltosLib.ao_flight_invalid + 1];
 	public double[]	state_end = new double[AltosLib.ao_flight_invalid + 1];
+	public String		product;
+	public String		firmware_version;
 	public int		serial;
 	public int		flight;
 	public int		year, month, day;
@@ -69,10 +71,9 @@ public class AltosFlightStats {
 
 		if (series.height_series != null) {
 			for (AltosTimeValue height : series.height_series) {
-				if (height.time >= landed_state_time) {
-					landed_height = height.value;
+				landed_height = height.value;
+				if (height.time >= landed_state_time)
 					break;
-				}
 			}
 		}
 
@@ -95,6 +96,9 @@ public class AltosFlightStats {
 				}
 			}
 		}
+
+		if (landed_time == AltosLib.MISSING)
+			landed_time = landed_state_time;
 		return landed_time;
 	}
 
@@ -132,6 +136,27 @@ public class AltosFlightStats {
 		boost_time = boost_time(series);
 		landed_time = landed_time(series);
 
+		if (series.state_series != null){
+			boolean fixed_boost = false;
+			boolean fixed_landed = false;
+			for (AltosTimeValue state : series.state_series) {
+				if ((int) state.value == AltosLib.ao_flight_boost)
+					if (boost_time != AltosLib.MISSING) {
+						state.time = boost_time;
+						fixed_boost = true;
+					}
+				if ((int) state.value == AltosLib.ao_flight_landed)
+					if (landed_time != AltosLib.MISSING) {
+						state.time = landed_time;
+						fixed_landed = true;
+					}
+			}
+			if (!fixed_boost && boost_time != AltosLib.MISSING)
+				series.state_series.add(boost_time, AltosLib.ao_flight_boost);
+			if (!fixed_landed && landed_time != AltosLib.MISSING)
+				series.state_series.add(landed_time, AltosLib.ao_flight_landed);
+		}
+
 		year = month = day = AltosLib.MISSING;
 		hour = minute = second = AltosLib.MISSING;
 		serial = flight = AltosLib.MISSING;
@@ -155,6 +180,7 @@ public class AltosFlightStats {
 				state_start[s] = series.state_series.time_of(s);
 			else
 				state_start[s] = AltosLib.MISSING;
+
 			if (s == AltosLib.ao_flight_main)
 				state_end[s] = landed_time;
 			else if (series.state_series != null)
@@ -162,6 +188,8 @@ public class AltosFlightStats {
 			else
 				state_end[s] = AltosLib.MISSING;
 
+			System.out.printf("state %s start %g end %g\n", AltosLib.state_name(s), state_start[s], state_end[s]);
+
 			if (state_end[s] > landed_time)
 				state_end[s] = landed_time;
 
@@ -172,6 +200,8 @@ public class AltosFlightStats {
 				state_accel[s] = series.accel_series.average(state_start[s], state_end[s]);
 		}
 
+		product = cal_data.product;
+		firmware_version = cal_data.firmware_version;
 		serial = cal_data.serial;
 		flight = cal_data.flight;
 
@@ -222,8 +252,10 @@ public class AltosFlightStats {
 				max_acceleration = tv.value;
 		}
 		max_gps_height = AltosLib.MISSING;
-		if (series.gps_height != null)
-			max_gps_height = series.gps_height.max().value;
-
+		if (series.gps_height != null) {
+			AltosTimeValue tv = series.gps_height.max();
+			if (tv != null)
+				max_gps_height = tv.value;
+		}
 	}
 }