X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=5fce15c43865e63b43447db93f59faf725f838f7;hb=368c7d583380b4453f432d5a965a1e4c45a92f92;hp=6926994c4292b7c6d19ef9e21ce98e32346f8767;hpb=7bdd0deabaae38ddfecd1ea2ea8deaf9af40b2ac;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 6926994c..5fce15c4 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_4;
+package org.altusmetrum.altoslib_5;
 
 public class AltosState implements Cloneable {
 
@@ -271,6 +271,7 @@ public class AltosState implements Cloneable {
 	public int	state;
 	public int	flight;
 	public int	serial;
+	public int	altitude_32;
 	public int	receiver_serial;
 	public boolean	landed;
 	public boolean	ascent;	/* going up? */
@@ -472,11 +473,7 @@ public class AltosState implements Cloneable {
 		pressure.set(p, time);
 	}
 
-	public double height() {
-		double k = kalman_height.value();
-		if (k != AltosLib.MISSING)
-			return k;
-
+	public double baro_height() {
 		double a = altitude();
 		double g = ground_altitude();
 		if (a != AltosLib.MISSING && g != AltosLib.MISSING)
@@ -484,6 +481,18 @@ public class AltosState implements Cloneable {
 		return AltosLib.MISSING;
 	}
 
+	public double height() {
+		double k = kalman_height.value();
+		if (k != AltosLib.MISSING)
+			return k;
+
+		double b = baro_height();
+		if (b != AltosLib.MISSING)
+			return b;
+
+		return gps_height();
+	}
+
 	public double max_height() {
 		double	k = kalman_height.max();
 		if (k != AltosLib.MISSING)
@@ -749,6 +758,7 @@ public class AltosState implements Cloneable {
 		speak_altitude = AltosLib.MISSING;
 
 		callsign = null;
+		firmware_version = null;
 
 		accel_plus_g = AltosLib.MISSING;
 		accel_minus_g = AltosLib.MISSING;
@@ -761,6 +771,7 @@ public class AltosState implements Cloneable {
 		product = null;
 		serial = AltosLib.MISSING;
 		receiver_serial = AltosLib.MISSING;
+		altitude_32 = AltosLib.MISSING;
 
 		baro = null;
 		companion = null;
@@ -886,6 +897,7 @@ public class AltosState implements Cloneable {
 		speak_altitude = old.speak_altitude;
 
 		callsign = old.callsign;
+		firmware_version = old.firmware_version;
 
 		accel_plus_g = old.accel_plus_g;
 		accel_minus_g = old.accel_minus_g;
@@ -897,6 +909,7 @@ public class AltosState implements Cloneable {
 		product = old.product;
 		serial = old.serial;
 		receiver_serial = old.receiver_serial;
+		altitude_32 = old.altitude_32;
 
 		baro = old.baro;
 		companion = old.companion;
@@ -908,8 +921,8 @@ public class AltosState implements Cloneable {
 	}
 
 	void update_gps() {
-		elevation = 0;
-		range = -1;
+		elevation = AltosLib.MISSING;
+		range = AltosLib.MISSING;
 
 		if (gps == null)
 			return;
@@ -1022,15 +1035,27 @@ public class AltosState implements Cloneable {
 		firmware_version = version;
 	}
 
+	public int compare_version(String other_version) {
+		if (firmware_version == null)
+			return AltosLib.MISSING;
+		return AltosLib.compare_version(firmware_version, other_version);
+	}
+
+	private void re_init() {
+		int bt = boost_tick;
+		int rs = receiver_serial;
+		init();
+		boost_tick = bt;
+		receiver_serial = rs;
+	}
+
 	public void set_flight(int flight) {
 
 		/* When the flight changes, reset the state */
-		if (flight != AltosLib.MISSING && flight != 0) {
+		if (flight != AltosLib.MISSING) {
 			if (this.flight != AltosLib.MISSING &&
 			    this.flight != flight) {
-				int bt = boost_tick;
-				init();
-				boost_tick = bt;
+				re_init();
 			}
 			this.flight = flight;
 		}
@@ -1041,9 +1066,7 @@ public class AltosState implements Cloneable {
 		if (serial != AltosLib.MISSING) {
 			if (this.serial != AltosLib.MISSING &&
 			    this.serial != serial) {
-				int bt = boost_tick;
-				init();
-				boost_tick = bt;
+				re_init();
 			}
 			this.serial = serial;
 		}
@@ -1054,6 +1077,15 @@ public class AltosState implements Cloneable {
 			receiver_serial = serial;
 	}
 
+	public boolean altitude_32() {
+		return altitude_32 == 1;
+	}
+
+	public void set_altitude_32(int altitude_32) {
+		if (altitude_32 != AltosLib.MISSING)
+			this.altitude_32 = altitude_32;
+	}
+
 	public int rssi() {
 		if (rssi == AltosLib.MISSING)
 			return 0;