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

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 6926994c..e0c00602 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 {
 
@@ -481,7 +481,7 @@ public class AltosState implements Cloneable {
 		double g = ground_altitude();
 		if (a != AltosLib.MISSING && g != AltosLib.MISSING)
 			return a - g;
-		return AltosLib.MISSING;
+		return gps_height();
 	}
 
 	public double max_height() {
@@ -749,6 +749,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;
@@ -886,6 +887,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;
@@ -908,8 +910,8 @@ public class AltosState implements Cloneable {
 	}
 
 	void update_gps() {
-		elevation = 0;
-		range = -1;
+		elevation = AltosLib.MISSING;
+		range = AltosLib.MISSING;
 
 		if (gps == null)
 			return;