X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=7415d5ad6584e54c4594fe44c21ef5588529c537;hp=2eff6ac1188610753c5b38c212183fbf2f0ac405;hb=de2b6ec1cdfd48c948bff7edbfe2540440429b1b;hpb=4b07adb395f2949dc76275d87b8af10430badb4b

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 2eff6ac1..7415d5ad 100644
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 /*
  * Calibration and other data needed to construct 'real' values from various data
@@ -72,6 +72,13 @@ public class AltosCalData {
 		}
 	}
 
+	public int		log_format = AltosLib.MISSING;
+
+	public void set_log_format(int log_format) {
+		if (log_format != AltosLib.MISSING)
+			this.log_format = log_format;
+	}
+
 	public int		config_major = AltosLib.MISSING;
 	public int		config_minor = AltosLib.MISSING;
 	public int		flight_log_max = AltosLib.MISSING;
@@ -313,25 +320,27 @@ public class AltosCalData {
 			gyro_zero_roll = roll;
 			gyro_zero_pitch = pitch;
 			gyro_zero_yaw = yaw;
+			imu_wrap_checked = false;
 		}
 	}
 
 	public double gyro_roll(double counts) {
 		if (gyro_zero_roll == AltosLib.MISSING || counts == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		return AltosIMU.convert_gyro(counts - gyro_zero_roll);
+
+		return AltosIMU.gyro_degrees_per_second(counts, gyro_zero_roll);
 	}
 
 	public double gyro_pitch(double counts) {
 		if (gyro_zero_pitch == AltosLib.MISSING || counts == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		return AltosIMU.convert_gyro(counts - gyro_zero_pitch);
+		return AltosIMU.gyro_degrees_per_second(counts, gyro_zero_pitch);
 	}
 
 	public double gyro_yaw(double counts) {
 		if (gyro_zero_yaw == AltosLib.MISSING || counts == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		return AltosIMU.convert_gyro(counts - gyro_zero_yaw);
+		return AltosIMU.gyro_degrees_per_second(counts, gyro_zero_yaw);
 	}
 
 	private double gyro_zero_overflow(double first) {
@@ -340,13 +349,25 @@ public class AltosCalData {
 			v = Math.ceil(v);
 		else
 			v = Math.floor(v);
+//		if (v != 0)
+//			System.out.printf("Adjusting gyro axis by %g steps\n", v);
 		return v * 128.0;
 	}
 
+	/* Initial TeleMega log format had only 16 bits for gyro cal, so the top 9 bits got lost as the
+	 * cal data are scaled by 512. Use the first sample to adjust the cal value, assuming that it is
+	 * from a time of fairly low rotation speed. Fixed in later TeleMega firmware by storing 32 bits
+	 * of cal values.
+	 */
+	private boolean imu_wrap_checked = false;
+
 	public void check_imu_wrap(double roll, double pitch, double yaw) {
-		gyro_zero_roll += gyro_zero_overflow(roll);
-		gyro_zero_pitch += gyro_zero_overflow(pitch);
-		gyro_zero_yaw += gyro_zero_overflow(yaw);
+		if (!imu_wrap_checked) {
+			gyro_zero_roll += gyro_zero_overflow(roll);
+			gyro_zero_pitch += gyro_zero_overflow(pitch);
+			gyro_zero_yaw += gyro_zero_overflow(yaw);
+			imu_wrap_checked = true;
+		}
 	}
 
 	public double mag_along(double along) {