diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-20 19:37:08 -0800 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-20 19:37:08 -0800 | 
| commit | 91bcfae2e64ecb2e7de1292b264910382b635aea (patch) | |
| tree | ec54fbfec63ffa3f5744b4530c8d23f2d9724048 /altoslib/AltosTelemetryMegaSensor.java | |
| parent | 2ad31bad20b20615e9d8b29088e2488fddc81ac9 (diff) | |
altoslib: Convert IMU and Mag sensor values to useful units
Convert from raw sensor values to metric units
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryMegaSensor.java')
| -rw-r--r-- | altoslib/AltosTelemetryMegaSensor.java | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java index 23b67af8..8afabd30 100644 --- a/altoslib/AltosTelemetryMegaSensor.java +++ b/altoslib/AltosTelemetryMegaSensor.java @@ -63,21 +63,21 @@ public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {  		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;  	} | 
