diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-01-22 20:55:41 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-01-22 20:55:41 -0700 |
| commit | 9884ca1449167a06bd2cebc7d28353eeac592493 (patch) | |
| tree | 9fde328b3a5971c67954e669c1ba27042821fd8c /altoslib/AltosTelemetryMegaSensor.java | |
| parent | 8e669694a60d34e2ea0f8f6b189e0bc3605d94d7 (diff) | |
| parent | 0ef0c50536e5eb6ad3455b5828983307edbab828 (diff) | |
Merge branch 'branch-1.3' into debian
Diffstat (limited to 'altoslib/AltosTelemetryMegaSensor.java')
| -rw-r--r-- | altoslib/AltosTelemetryMegaSensor.java | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index 23b67af8..d1a463c0 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_2; +package org.altusmetrum.altoslib_3; public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { int accel; @@ -34,9 +34,12 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { int mag_y; int mag_z; + int orient; + public AltosTelemetryMegaSensor(int[] bytes) { super(bytes); + orient = int8(5); accel = int16(6); pres = int32(8); temp = int16(12); @@ -61,23 +64,25 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard { state.set_pressure(pres); state.set_temperature(temp / 100.0); + state.set_orient(orient); + AltosIMU imu = new AltosIMU(); - imu.accel_x = accel_x; - imu.accel_y = accel_y; - imu.accel_z = accel_z; + 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 = gyro_x; - imu.gyro_y = gyro_y; - imu.gyro_z = gyro_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 = mag_x; - mag.y = mag_y; - mag.z = mag_z; + mag.x = AltosMag.convert_gauss(mag_x); + mag.y = AltosMag.convert_gauss(mag_y); + mag.z = AltosMag.convert_gauss(mag_z); state.mag = mag; } |