X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=e3ea0524e90b8bd3d873aeb50d7ba722e6a80340;hb=528fdc4e03466430c8d81fc78c90d3c9e8465ca7;hp=712f8e19dd4e566c11c0628b8c6175b323b4583b;hpb=58e7fccc24f933fd64e272207f783ca79002b7ba;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 712f8e19..e3ea0524 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -20,7 +20,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 public class AltosState extends AltosDataListener {
 
@@ -513,26 +513,27 @@ public class AltosState extends AltosDataListener {
 	}
 
 	public double height() {
-		double k = kalman_height.value();
-		if (k != AltosLib.MISSING)
-			return k;
-
 		double b = baro_height();
 		if (b != AltosLib.MISSING)
 			return b;
 
+		double k = kalman_height.value();
+		if (k != AltosLib.MISSING)
+			return k;
+
 		return gps_height();
 	}
 
 	public double max_height() {
-		double	k = kalman_height.max();
-		if (k != AltosLib.MISSING)
-			return k;
-
 		double a = altitude.max();
 		double g = ground_altitude();
 		if (a != AltosLib.MISSING && g != AltosLib.MISSING)
 			return a - g;
+
+		double	k = kalman_height.max();
+		if (k != AltosLib.MISSING)
+			return k;
+
 		return max_gps_height();
 	}