X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=98f13dac50965e6fc43b5be336b1bb949b70b84a;hb=6804ead7f7e54ff34b257e10e381dc52d5a61b06;hp=1b88cb9fc7e56e7b8b2abf7ae308571837c862ad;hpb=c8078d352a7f54a4a97d25af080155d3f875536a;p=fw%2Faltos

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 1b88cb9f..98f13dac 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 
@@ -37,6 +38,8 @@ public class AltosFlightStats {
 	public double		pad_lat, pad_lon;
 	public boolean		has_flight_data;
 	public boolean		has_gps;
+	public boolean		has_gps_sats;
+	public boolean		has_gps_detail;
 	public boolean		has_flight_adc;
 	public boolean		has_battery;
 	public boolean		has_rssi;
@@ -50,12 +53,12 @@ public class AltosFlightStats {
 
 		for (AltosState s : states) {
 			state = s;
-			if (state.state == AltosLib.ao_flight_landed)
+			if (state.state() == AltosLib.ao_flight_landed)
 				break;
 		}
 
 		if (state == null)
-			return 0;
+			return AltosLib.MISSING;
 
 		double	landed_height = state.height();
 
@@ -63,7 +66,7 @@ public class AltosFlightStats {
 
 		boolean	above = true;
 
-		double	landed_time = -1000;
+		double	landed_time = AltosLib.MISSING;
 
 		for (AltosState s : states) {
 			state = s;
@@ -71,14 +74,12 @@ public class AltosFlightStats {
 			if (state.height() > landed_height + 10) {
 				above = true;
 			} else {
-				if (above && state.height() < landed_height + 2) {
+				if (above && Math.abs(state.height() - landed_height) < 2) {
 					above = false;
 					landed_time = state.time;
 				}
 			}
 		}
-		if (landed_time == -1000)
-			landed_time = state.time;
 		return landed_time;
 	}
 
@@ -90,14 +91,12 @@ public class AltosFlightStats {
 			state = s;
 			if (state.acceleration() < 1)
 				boost_time = state.time;
-			if (state.state >= AltosLib.ao_flight_boost && state.state <= AltosLib.ao_flight_landed)
+			if (state.state() >= AltosLib.ao_flight_boost && state.state() <= AltosLib.ao_flight_landed)
 				break;
 		}
 		if (state == null)
-			return 0;
+			return AltosLib.MISSING;
 
-		if (boost_time == AltosLib.MISSING)
-			boost_time = state.time;
 		return boost_time;
 	}
 
@@ -113,12 +112,20 @@ public class AltosFlightStats {
 		lat = lon = AltosLib.MISSING;
 		has_flight_data = false;
 		has_gps = false;
+		has_gps_sats = false;
 		has_flight_adc = false;
 		has_battery = false;
 		has_rssi = false;
 		has_imu = false;
 		has_mag = false;
 		has_orient = false;
+
+		for (int s = AltosLib.ao_flight_startup; s <= AltosLib.ao_flight_landed; s++) {
+			state_count[s] = 0;
+			state_speed[s] = 0.0;
+			state_accel[s] = 0.0;
+		}
+
 		for (AltosState state : states) {
 			if (serial == AltosLib.MISSING && state.serial != AltosLib.MISSING)
 				serial = state.serial;
@@ -135,11 +142,14 @@ public class AltosFlightStats {
 			if (state.pressure() != AltosLib.MISSING)
 				has_flight_data = true;
 
-			int state_id = state.state;
-			if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost)
+			int state_id = state.state();
+			if (boost_time != AltosLib.MISSING && state.time >= boost_time && state_id < AltosLib.ao_flight_boost) {
 				state_id = AltosLib.ao_flight_boost;
-			if (state.time >= landed_time && state_id < AltosLib.ao_flight_landed)
+			}
+			if (landed_time != AltosLib.MISSING && state.time >= landed_time && state_id < AltosLib.ao_flight_landed) {
 				state_id = AltosLib.ao_flight_landed;
+			}
+
 			if (state.gps != null && state.gps.locked) {
 				year = state.gps.year;
 				month = state.gps.month;
@@ -174,6 +184,10 @@ public class AltosFlightStats {
 				lat = state.gps.lat;
 				lon = state.gps.lon;
 				has_gps = true;
+				if (state.gps.cc_gps_sat != null)
+					has_gps_sats = true;
+				if (state.gps.course != AltosLib.MISSING)
+					has_gps_detail = true;
 			}
 			if (state.imu != null)
 				has_imu = true;