diff options
| author | Keith Packard <keithp@keithp.com> | 2017-06-11 22:39:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-06-11 22:54:22 -0700 |
| commit | 8da38e5217f366a7da24a8af4a5ca620fad35df3 (patch) | |
| tree | a79cbd0310faf9c49e43bb7b32b8a4c64e0a415a /altoslib/AltosTelemetryMegaSensor.java | |
| parent | 2a05849c3bf8c1617409237be48802dd6fc6255b (diff) | |
altoslib: Adapt to Mag sensor value ordering changes
The HMC5883 sensor data is ordered x, z, y. Relabel everything to
match that to preserve compatibility with existing firmware. With the
data correctly ordered, fix the labling of the axes along, across and
through.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryMegaSensor.java')
| -rw-r--r-- | altoslib/AltosTelemetryMegaSensor.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index 396bdb16..b5e9d13c 100644 --- a/altoslib/AltosTelemetryMegaSensor.java +++ b/altoslib/AltosTelemetryMegaSensor.java @@ -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), |