X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryMegaSensor.java;h=6acbb5bc5751b48f0db4eb83c6e097a7fd15ede4;hp=749f6bbd30fe9e41bfd4803e4480368ee42695a7;hb=HEAD;hpb=06cf43cea9149f8c04c80785a613408454eab4f2

diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java
index 749f6bbd..6acbb5bc 100644
--- a/altoslib/AltosTelemetryMegaSensor.java
+++ b/altoslib/AltosTelemetryMegaSensor.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;
 
 public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 	int	orient() { return int8(5); }
@@ -39,6 +39,104 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 
 	int imu_type;
 
+	private int accel_across(int imu_type) {
+		switch (imu_type) {
+		case AltosIMU.imu_type_telemega_v1_v2:
+		case AltosIMU.imu_type_telemega_v3:
+		case AltosIMU.imu_type_easymega_v1:
+			return accel_x();
+		case AltosIMU.imu_type_easymega_v2:
+			return -accel_y();
+		case  AltosIMU.imu_type_telemega_v4:
+			return -accel_y();
+		default:
+			return AltosLib.MISSING;
+		}
+	}
+
+	private int accel_along(int imu_type) {
+		switch (imu_type) {
+		case AltosIMU.imu_type_telemega_v1_v2:
+		case AltosIMU.imu_type_telemega_v3:
+		case AltosIMU.imu_type_easymega_v1:
+			return accel_y();
+		case AltosIMU.imu_type_easymega_v2:
+		case AltosIMU.imu_type_telemega_v4:
+			return accel_x();
+		default:
+			return AltosLib.MISSING;
+		}
+	}
+
+	private int accel_through(int imu_type) {
+		return accel_z();
+	}
+
+	private int gyro_roll(int imu_type) {
+		switch (imu_type) {
+		case AltosIMU.imu_type_telemega_v1_v2:
+		case AltosIMU.imu_type_telemega_v3:
+		case AltosIMU.imu_type_easymega_v1:
+			return gyro_y();
+		case AltosIMU.imu_type_easymega_v2:
+		case AltosIMU.imu_type_telemega_v4:
+			return gyro_x();
+		default:
+			return AltosLib.MISSING;
+		}
+	}
+
+	private int gyro_pitch(int imu_type) {
+		switch (imu_type) {
+		case AltosIMU.imu_type_telemega_v1_v2:
+		case AltosIMU.imu_type_telemega_v3:
+		case AltosIMU.imu_type_easymega_v1:
+			return gyro_x();
+		case AltosIMU.imu_type_easymega_v2:
+			return -gyro_y();
+		case AltosIMU.imu_type_telemega_v4:
+			return gyro_y();
+		default:
+			return AltosLib.MISSING;
+		}
+	}
+
+	private int gyro_yaw(int imu_type) {
+		return gyro_z();
+	}
+
+	private int mag_across(int imu_type) {
+		switch (imu_type) {
+		case AltosIMU.imu_type_telemega_v1_v2:
+		case AltosIMU.imu_type_telemega_v3:
+		case AltosIMU.imu_type_easymega_v1:
+			return mag_x();
+		case AltosIMU.imu_type_telemega_v4:
+		case AltosIMU.imu_type_easymega_v2:
+			return -mag_y();
+		default:
+			return AltosLib.MISSING;
+		}
+	}
+
+	private int mag_along(int imu_type) {
+		switch (imu_type) {
+		case AltosIMU.imu_type_telemega_v1_v2:
+		case AltosIMU.imu_type_telemega_v3:
+		case AltosIMU.imu_type_easymega_v1:
+			return mag_y();
+		case AltosIMU.imu_type_easymega_v2:
+		case AltosIMU.imu_type_telemega_v4:
+			return mag_x();
+		default:
+			return AltosLib.MISSING;
+		}
+	}
+
+	private int mag_through(int imu_type) {
+		return mag_z();
+	}
+
 	public AltosTelemetryMegaSensor(int[] bytes, int imu_type) throws AltosCRCException {
 		super(bytes);
 		switch (imu_type) {
@@ -74,16 +172,17 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 		if (cal_data.gyro_zero_roll == AltosLib.MISSING)
 			cal_data.set_gyro_zero(0, 0, 0);
 
-		int	accel_along = accel_y();
-		int	accel_across = accel_x();
-		int	accel_through = accel_z();
-		int	gyro_roll = gyro_y();
-		int	gyro_pitch = gyro_x();
-		int	gyro_yaw = gyro_z();
+		int	accel_along = accel_along(imu_type);
+		int	accel_across = accel_across(imu_type);
+		int	accel_through = accel_through(imu_type);
+
+		int	gyro_roll = gyro_roll(imu_type);
+		int	gyro_pitch = gyro_pitch(imu_type);
+		int	gyro_yaw = gyro_yaw(imu_type);
 
-		int	mag_along = mag_y();
-		int	mag_across = mag_x();
-		int	mag_through = mag_z();
+		int	mag_along = mag_along(imu_type);
+		int	mag_across = mag_across(imu_type);
+		int	mag_through = mag_through(imu_type);
 
 		listener.set_accel(cal_data.accel_along(accel_along),
 				   cal_data.accel_across(accel_across),