X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMegaSensor.java;h=efcc3ccb6c19ea312814767b657a56b6433449eb;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=396bdb16eddfe9aef965d3d6a12b1b23f7446b6f;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index 396bdb16..efcc3ccb 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_11; +package org.altusmetrum.altoslib_12; public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { int orient() { return int8(5); } @@ -34,8 +34,8 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { int gyro_z() { return int16(24); } int mag_x() { return int16(26); } - int mag_y() { return int16(28); } - int mag_z() { return int16(30); } + int mag_z() { return int16(28); } + int mag_y() { return int16(30); } public AltosTelemetryMegaSensor(int[] bytes) throws AltosCRCException { super(bytes); @@ -64,8 +64,8 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { int gyro_pitch = gyro_x(); int gyro_yaw = gyro_z(); - int mag_along = mag_x(); - int mag_across = mag_y(); + int mag_along = mag_y(); + int mag_across = mag_x(); int mag_through = mag_z(); listener.set_accel(cal_data.accel_along(accel_along),