X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryMegaSensor.java;h=e97e18e2872da723093e5fbf4704d1dd55102e08;hp=396bdb16eddfe9aef965d3d6a12b1b23f7446b6f;hb=9791ebb256c2892663c072f7989e4b9bd34818a1;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java
index 396bdb16..e97e18e2 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_13;
 
 public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 	int	orient() { return int8(5); }
@@ -34,15 +34,17 @@ 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);
 	}
 
-	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-		super.provide_data(listener, cal_data);
+	public void provide_data(AltosDataListener listener) {
+		super.provide_data(listener);
+
+		AltosCalData cal_data = listener.cal_data();
 
 		listener.set_acceleration(cal_data.acceleration(accel()));
 		listener.set_pressure(pres());
@@ -64,8 +66,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),