X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=4371ad8503dbc88576978e7b5085b987a7c41ed7;hb=528fdc4e03466430c8d81fc78c90d3c9e8465ca7;hp=7a5c222e1df43e675e119c6b0443cc990721da48;hpb=06cf43cea9149f8c04c80785a613408454eab4f2;p=fw%2Faltos

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 7a5c222e..4371ad85 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.util.concurrent.*;
 import java.io.*;
@@ -88,11 +88,7 @@ public class AltosIMU implements Cloneable {
 	public static final double MAG_COUNTS_MPU = 32767.0;
 	public static final double counts_per_gauss_mpu = MAG_COUNTS_MPU / MAG_FULLSCALE_GAUSS_MPU;
 
-	public static final double MAG_FULLSCALE_GAUSS_BMX_XY = 11.50;	/* 1150µT */
-	public static final double MAG_FULLSCALE_GAUSS_BMX_Z = 25.00;	/* 2500µT */
-	public static final double MAG_COUNTS_BMX = 32767.0;
-	public static final double counts_per_gauss_bmx_xy = MAG_COUNTS_BMX / MAG_FULLSCALE_GAUSS_BMX_XY;
-	public static final double counts_per_gauss_bmx_z = MAG_COUNTS_BMX / MAG_FULLSCALE_GAUSS_BMX_Z;
+	public static final double counts_per_gauss_bmx = 100.0;	/* BMX driver converts to µT */
 
 	public static double counts_per_gauss(int imu_type, int axis) {
 		switch(imu_type) {
@@ -103,14 +99,7 @@ public class AltosIMU implements Cloneable {
 		case imu_type_easymega_v2:
 			return counts_per_gauss_mpu;
 		case imu_type_telemega_v4:
-			switch (axis) {
-			case imu_axis_x:
-			case imu_axis_y:
-				return counts_per_gauss_bmx_xy;
-			case imu_axis_z:
-				return counts_per_gauss_bmx_z;
-			}
-			/* fall through */
+			return 100.0;
 		default:
 			return AltosLib.MISSING;
 		}
@@ -223,6 +212,7 @@ public class AltosIMU implements Cloneable {
 		case imu_type_easymega_v1:
 			return gyro_x;
 		case imu_type_easymega_v2:
+			return -gyro_y;
 		case imu_type_telemega_v4:
 			return -gyro_y;
 		default:
@@ -254,9 +244,10 @@ public class AltosIMU implements Cloneable {
 		case imu_type_telemega_v3:
 		case imu_type_easymega_v1:
 			return mag_x;
-		case imu_type_telemega_v4:
 		case imu_type_easymega_v2:
 			return -mag_y;
+		case imu_type_telemega_v4:
+			return mag_y;
 		default:
 			return AltosLib.MISSING;
 		}