X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=ddda82b9e4fd3a686ff8cac1eead1b3e8a0a38bd;hb=7385c76af46ff400b9e79a8540199be289cb57c0;hp=d65e3bd88fb2bc466ce97457d3d8c478ebefdfb7;hpb=adddad0dd45f67d01487c8dd75b040ca3ab50fe2;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index d65e3bd8..ddda82b9 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;
 
 public class AltosState implements Cloneable {
 
@@ -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);
@@ -614,11 +630,14 @@ public class AltosState implements Cloneable {
 	public double	ground_accel_avg;
 
 	public int	log_format;
+	public String	product;
 
 	public AltosMs5607	baro;
 
 	public AltosCompanion	companion;
 
+	public int	pyro_fired;
+
 	public void set_npad(int npad) {
 		this.npad = npad;
 		gps_waiting = MIN_PAD_SAMPLES - npad;
@@ -692,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;
@@ -706,11 +728,14 @@ public class AltosState implements Cloneable {
 		ground_accel_avg = AltosLib.MISSING;
 
 		log_format = AltosLib.MISSING;
+		product = null;
 		serial = AltosLib.MISSING;
 		receiver_serial = AltosLib.MISSING;
 
 		baro = null;
 		companion = null;
+
+		pyro_fired = 0;
 	}
 
 	void finish_update() {
@@ -818,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;
@@ -835,11 +863,14 @@ public class AltosState implements Cloneable {
 		ground_accel_avg = old.ground_accel_avg;
 
 		log_format = old.log_format;
+		product = old.product;
 		serial = old.serial;
 		receiver_serial = old.receiver_serial;
 
 		baro = old.baro;
 		companion = old.companion;
+
+		pyro_fired = old.pyro_fired;
 	}
 
 	void update_time() {
@@ -868,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 &&
@@ -1114,6 +1151,10 @@ public class AltosState implements Cloneable {
 		this.ignitor_voltage = voltage;
 	}
 
+	public void set_pyro_fired(int fired) {
+		this.pyro_fired = fired;
+	}
+
 	public double time_since_boost() {
 		if (tick == AltosLib.MISSING)
 			return 0.0;