X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=87b9f08bedb58360decd8fa2c44ea14ca85da5be;hb=a6687ce902a3011796aee93f87d08545e5f0cec9;hp=3ce49499ba3d60359e309df843e18f2cb8d48e2e;hpb=a4039a60bbe972fd022699d62ab06a8f1bc4af69;p=fw%2Faltos

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 3ce49499..87b9f08b 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;
 		}
@@ -126,8 +115,6 @@ public class AltosIMU implements Cloneable {
 
 		String[] items = line.split("\\s+");
 
-		System.out.printf("length %d\n", items.length);
-
 		if (items.length >= 8) {
 			accel_x = Integer.parseInt(items[1]);
 			accel_y = Integer.parseInt(items[2]);