X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=b49e3792fad00074316191d91a51a9346db5ab3c;hb=2969f0af52dfbdea7593b208e510c7b17227064c;hp=cb58e4929c3056ada5af4db3b6249d53a9e16932;hpb=78b4bf77fca96bef2cce443ad4c9544ae83f0acc;p=fw%2Faltos

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index cb58e492..b49e3792 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
@@ -168,6 +168,7 @@ public class AltosCalData {
 	}
 
 	public int		tick = AltosLib.MISSING;
+	private int		first_tick = AltosLib.MISSING;
 	private int		prev_tick = AltosLib.MISSING;
 
 	public void set_tick(int tick) {
@@ -177,6 +178,8 @@ public class AltosCalData {
 					tick += 65536;
 				}
 			}
+			if (first_tick == AltosLib.MISSING)
+				first_tick = tick;
 			prev_tick = tick;
 			this.tick = tick;
 		}
@@ -209,9 +212,11 @@ public class AltosCalData {
 	public double time() {
 		if (tick == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		if (boost_tick == AltosLib.MISSING)
-			return AltosLib.MISSING;
-		return (tick - boost_tick) / ticks_per_sec;
+		if (boost_tick != AltosLib.MISSING)
+			return (tick - boost_tick) / ticks_per_sec;
+		if (first_tick != AltosLib.MISSING)
+			return (tick - first_tick) / ticks_per_sec;
+		return tick / ticks_per_sec;
 	}
 
 	public double boost_time() {
@@ -308,25 +313,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) {
@@ -335,13 +342,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) {