X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMegaSensor.java;h=f0d16f1925fce78144843d6da8953e3f0429a165;hb=f078235803a80403014b3e54039fd2d0e0704367;hp=d9fd7fdeadc0a25a09cdc5a02a21e54c1d93e9b7;hpb=9e18c524fa2d1f648f265b3c3105f5ceacf06c10;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java
index d9fd7fde..f0d16f19 100644
--- a/altoslib/AltosTelemetryMegaSensor.java
+++ b/altoslib/AltosTelemetryMegaSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_10;
 
 public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 	int	accel;
@@ -66,24 +66,13 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 
 		state.set_orient(orient);
 
-		AltosIMU imu = new AltosIMU();
+		state.set_imu(new AltosIMU(accel_y,	/* along */
+					   accel_x,	/* across */
+					   accel_z,	/* through */
+					   gyro_y,	/* along */
+					   gyro_x,	/* across */
+					   gyro_z));	/* through */
 
-		imu.accel_x = AltosIMU.convert_accel(accel_x);
-		imu.accel_y = AltosIMU.convert_accel(accel_y);
-		imu.accel_z = AltosIMU.convert_accel(accel_z);
-
-		imu.gyro_x = AltosIMU.convert_gyro(gyro_x);
-		imu.gyro_y = AltosIMU.convert_gyro(gyro_y);
-		imu.gyro_z = AltosIMU.convert_gyro(gyro_z);
-
-		state.imu = imu;
-
-		AltosMag mag = new AltosMag();
-
-		mag.x = AltosMag.convert_gauss(mag_x);
-		mag.y = AltosMag.convert_gauss(mag_y);
-		mag.z = AltosMag.convert_gauss(mag_z);
-
-		state.mag = mag;
+		state.set_mag(new AltosMag(mag_x, mag_y, mag_z));
 	}
 }