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

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 7a64f8a1..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();
 	}
 
@@ -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();
@@ -903,9 +900,9 @@ public class AltosState extends AltosDataListener {
 
 	void update_pad_rotation() {
 		if (cal_data().pad_orientation != AltosLib.MISSING && accel_ground_along != AltosLib.MISSING) {
-			rotation = new AltosRotation(AltosIMU.convert_accel(accel_ground_across - cal_data().accel_zero_across),
-						     AltosIMU.convert_accel(accel_ground_through - cal_data().accel_zero_through),
-						     AltosIMU.convert_accel(accel_ground_along - cal_data().accel_zero_along),
+			rotation = new AltosRotation(accel_ground_across,
+						     accel_ground_through,
+						     accel_ground_along,
 						     cal_data().pad_orientation);
 			orient.set_computed(rotation.tilt(), time);
 		}