diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
| commit | f766a457323268857b3f2dfc7f42427437b71cb7 (patch) | |
| tree | 8afc8a661d682fc34b16fc0b1b44f2844d34f336 /altoslib/AltosTelemetryMegaSensor.java | |
| parent | db51224af01731e7323f6f696a7397d64eb80b92 (diff) | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
Merge branch 'branch-1.6' into debian
Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac
Diffstat (limited to 'altoslib/AltosTelemetryMegaSensor.java')
| -rw-r--r-- | altoslib/AltosTelemetryMegaSensor.java | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index 1b568c88..a01c0826 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_5; +package org.altusmetrum.altoslib_6; 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)); } } |