X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altoslib%2FAltosState.java;h=08dafbb4c8ad6d12333e458638e6732abc04aede;hb=cc06242e882cba462791962c199b7c89e79adc65;hp=4ddcc4ed0bb1f2d01f31e7a5ae2cd068d54af467;hpb=796cb90e3241103f79ae12565cf6f0dad21cb57c;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 4ddcc4ed..08dafbb4 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_2;
+package org.altusmetrum.altoslib_3;
 
 public class AltosState implements Cloneable {
 
@@ -474,6 +474,10 @@ public class AltosState implements Cloneable {
 		return orient.value();
 	}
 
+	public double max_orient() {
+		return orient.max();
+	}
+
 	public AltosValue	kalman_height, kalman_speed, kalman_acceleration;
 
 	public void set_kalman(double height, double speed, double acceleration) {
@@ -945,14 +949,8 @@ public class AltosState implements Cloneable {
 	}
 
 	void update_accel() {
-		double	ground = ground_accel;
-
-		if (ground == AltosLib.MISSING)
-			ground = ground_accel_avg;
 		if (accel == AltosLib.MISSING)
 			return;
-		if (ground == AltosLib.MISSING)
-			return;
 		if (accel_plus_g == AltosLib.MISSING)
 			return;
 		if (accel_minus_g == AltosLib.MISSING)
@@ -960,7 +958,7 @@ public class AltosState implements Cloneable {
 
 		double counts_per_g = (accel_minus_g - accel_plus_g) / 2.0;
 		double counts_per_mss = counts_per_g / 9.80665;
-		acceleration.set_measured((ground - accel) / counts_per_mss, time);
+		acceleration.set_measured((accel_plus_g - accel) / counts_per_mss, time);
 	}
 
 	public void set_accel_g(double accel_plus_g, double accel_minus_g) {
@@ -972,10 +970,8 @@ public class AltosState implements Cloneable {
 	}
 
 	public void set_ground_accel(double ground_accel) {
-		if (ground_accel != AltosLib.MISSING) {
+		if (ground_accel != AltosLib.MISSING)
 			this.ground_accel = ground_accel;
-			update_accel();
-		}
 	}
 
 	public void set_accel(double accel) {