X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosState.java;h=eea7a9c6760c1bfd4acd7cd86aa0c63c334c66f7;hp=b3bcff925cfe9ed390cbb0ae46ad4d0ebccfed0d;hb=305e7852f764e6a06024a9d57b5766d2f8a056ee;hpb=f51ad734dfccfa2d4b7515a94dc337eb2b2708a2

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index b3bcff92..eea7a9c6 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -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();
 	}
 
@@ -860,10 +861,6 @@ public class AltosState extends AltosDataListener {
 		}
 	}
 
-	public String state_name() {
-		return AltosLib.state_name(state());
-	}
-
 	public void set_state(int state) {
 		super.set_state(state);
 		ascent = (AltosLib.ao_flight_boost <= state() &&
@@ -888,8 +885,8 @@ public class AltosState extends AltosDataListener {
 		received_time = ms;
 	}
 
-	public void set_gps(AltosGPS gps) {
-		super.set_gps(gps);
+	public void set_gps(AltosGPS gps, boolean set_location, boolean set_sats) {
+		super.set_gps(gps, set_location, set_sats);
 		if (gps != null) {
 			this.gps = gps;
 			update_gps();