X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=2d75f72e676881b45cbc63b9ec9e13dfb90308b4;hb=6fc58142d2a108c91d257eb0175098bf082834f9;hp=9e8e22ac8d945168512db1266df11656c63cc9e4;hpb=4a5ef9eaa8b809c56813625133120e7e91fc8e65;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 9e8e22ac..2d75f72e 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -389,6 +389,10 @@ public class AltosState implements Cloneable {
 
 	private AltosGpsAltitude	gps_altitude;
 
+	private AltosValue		gps_ground_speed;
+	private AltosValue		gps_ascent_rate;
+	private AltosValue		gps_course;
+
 	public double altitude() {
 		double a = altitude.value();
 		if (a != AltosLib.MISSING)
@@ -419,6 +423,18 @@ public class AltosState implements Cloneable {
 		gps_altitude.set(new_gps_altitude, time);
 	}
 
+	public double gps_ground_speed() {
+		return gps_ground_speed.value();
+	}
+
+	public double gps_ascent_rate() {
+		return gps_ascent_rate.value();
+	}
+
+	public double gps_course() {
+		return gps_course.value();
+	}
+
 	class AltosPressure extends AltosValue {
 		void set(double p, double time) {
 			super.set(p, time);
@@ -484,7 +500,7 @@ public class AltosState implements Cloneable {
 	class AltosSpeed extends AltosCValue {
 
 		boolean can_max() {
-			return state < AltosLib.ao_flight_fast;
+			return state < AltosLib.ao_flight_fast || state == AltosLib.ao_flight_stateless;
 		}
 
 		void set_accel() {
@@ -526,7 +542,7 @@ public class AltosState implements Cloneable {
 	class AltosAccel extends AltosCValue {
 
 		boolean can_max() {
-			return state < AltosLib.ao_flight_fast;
+			return state < AltosLib.ao_flight_fast || state == AltosLib.ao_flight_stateless;
 		}
 
 		void set_measured(double a, double time) {
@@ -695,6 +711,9 @@ public class AltosState implements Cloneable {
 
 		gps_altitude = new AltosGpsAltitude();
 		gps_ground_altitude = new AltosGpsGroundAltitude();
+		gps_ground_speed = new AltosValue();
+		gps_ascent_rate = new AltosValue();
+		gps_course = new AltosValue();
 
 		speak_tick = AltosLib.MISSING;
 		speak_altitude = AltosLib.MISSING;
@@ -824,6 +843,9 @@ public class AltosState implements Cloneable {
 
 		gps_altitude.copy(old.gps_altitude);
 		gps_ground_altitude.copy(old.gps_ground_altitude);
+		gps_ground_speed.copy(old.gps_ground_speed);
+		gps_ascent_rate.copy(old.gps_ascent_rate);
+		gps_course.copy(old.gps_course);
 
 		pad_lat = old.pad_lat;
 		pad_lon = old.pad_lon;
@@ -863,9 +885,9 @@ public class AltosState implements Cloneable {
 
 		if (gps.locked && gps.nsat >= 4) {
 			/* Track consecutive 'good' gps reports, waiting for 10 of them */
-			if (state == AltosLib.ao_flight_pad) {
+			if (state == AltosLib.ao_flight_pad || state == AltosLib.ao_flight_stateless) {
 				set_npad(npad+1);
-				if (pad_lat != AltosLib.MISSING) {
+				if (pad_lat != AltosLib.MISSING && (npad < 10 || state == AltosLib.ao_flight_pad)) {
 					pad_lat = (pad_lat * 31 + gps.lat) / 32;
 					pad_lon = (pad_lon * 31 + gps.lon) / 32;
 					gps_ground_altitude.set_filtered(gps.alt, time);
@@ -877,6 +899,12 @@ public class AltosState implements Cloneable {
 				gps_ground_altitude.set(gps.alt, time);
 			}
 			gps_altitude.set(gps.alt, time);
+			if (gps.climb_rate != AltosLib.MISSING)
+				gps_ascent_rate.set(gps.climb_rate, time);
+			if (gps.ground_speed != AltosLib.MISSING)
+				gps_ground_speed.set(gps.ground_speed, time);
+			if (gps.course != AltosLib.MISSING)
+				gps_course.set(gps.course, time);
 		}
 		if (gps.lat != 0 && gps.lon != 0 &&
 		    pad_lat != AltosLib.MISSING &&
@@ -921,18 +949,34 @@ public class AltosState implements Cloneable {
 				  state <= AltosLib.ao_flight_coast);
 			boost = (AltosLib.ao_flight_boost == state);
 		}
-
 	}
 
 	public void set_device_type(int device_type) {
 		this.device_type = device_type;
+		switch (device_type) {
+		case AltosLib.product_telegps:
+			this.state = AltosLib.ao_flight_stateless;
+			break;
+		}
 	}
 
-	public void set_config(int major, int minor, int apogee_delay, int main_deploy, int flight_log_max) {
-		config_major = major;
-		config_minor = minor;
+	public void set_log_format(int log_format) {
+		this.log_format = log_format;
+		switch (log_format) {
+		case AltosLib.AO_LOG_FORMAT_TELEGPS:
+			this.state = AltosLib.ao_flight_stateless;
+			break;
+		}
+	}
+
+	public void set_flight_params(int apogee_delay, int main_deploy) {
 		this.apogee_delay = apogee_delay;
 		this.main_deploy = main_deploy;
+	}
+
+	public void set_config(int major, int minor, int flight_log_max) {
+		config_major = major;
+		config_minor = minor;
 		this.flight_log_max = flight_log_max;
 	}