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/AltosEepromRecordMega.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/AltosEepromRecordMega.java')
| -rw-r--r-- | altoslib/AltosEepromRecordMega.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java index 18d435af..d0da1b7c 100644 --- a/altoslib/AltosEepromRecordMega.java +++ b/altoslib/AltosEepromRecordMega.java @@ -73,8 +73,8 @@ public class AltosEepromRecordMega extends AltosEepromRecord { private int gyro_y() { return data16(16); } private int gyro_z() { return data16(18); } private int mag_x() { return data16(20); } - private int mag_y() { return data16(22); } - private int mag_z() { return data16(24); } + private int mag_z() { return data16(22); } + private int mag_y() { return data16(24); } private int accel() { return data16(26); } /* AO_LOG_TEMP_VOLT elements */ @@ -142,8 +142,8 @@ public class AltosEepromRecordMega extends AltosEepromRecord { 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(); if (log_format == AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD) |