fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 02:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed axis assignment and raw value outputs. Scaling and offsets to be done

Browse Source
This commit is contained in:
Lorenz Meier
2012-08-26 13:51:18 +02:00
parent 60311a3778
commit 6026595d83
3 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/drivers/hmc5883/hmc5883.cpp
+11 -2
View File
@@ -658,9 +658,18 @@ HMC5883::collect()
(abs(report.z) > 2048))
goto out;
/* raw outputs */
/* to align the sensor axes with the board, x and y need to be flipped */
_reports[_next_report].x_raw = report.y;
_reports[_next_report].y_raw = report.x;
/* z remains z */
_reports[_next_report].z_raw = report.z;
/* scale values for output */
_reports[_next_report].x = report.x * _scale.x_scale + _scale.x_offset;
_reports[_next_report].y = report.y * _scale.y_scale + _scale.y_offset;
/* to align the sensor axes with the board, x and y need to be flipped */
_reports[_next_report].x = report.y * _scale.x_scale + _scale.x_offset;
_reports[_next_report].y = report.x * _scale.y_scale + _scale.y_offset;
/* z remains z */
_reports[_next_report].z = report.z * _scale.z_scale + _scale.z_offset;
/* publish it */
apps/drivers/mpu6000/mpu6000.cpp
+15 -8
View File
@@ -790,22 +790,29 @@ MPU6000::measure()
*/
_gyro_report.timestamp = _accel_report.timestamp = hrt_absolute_time();
_accel_report.x_raw = report.accel_x;
/* to align the sensor axes with the board, x and y need to be flipped */
_accel_report.x_raw = report.accel_y;
_accel_report.y_raw = report.accel_x;
_accel_report.z_raw = report.accel_x;
/* z remains z and has the right sign */
_accel_report.z_raw = report.accel_z;
_accel_report.x = report.accel_x * _accel_range_scale;
_accel_report.y = report.accel_y * _accel_range_scale;
/* to align the sensor axes with the board, x and y need to be flipped */
_accel_report.x = report.accel_y * _accel_range_scale;
_accel_report.y = report.accel_x * _accel_range_scale;
/* z remains z and has the right sign */
_accel_report.z = report.accel_z * _accel_range_scale;
_accel_report.scaling = _accel_range_scale;
_accel_report.range_m_s2 = _accel_range_m_s2;
_gyro_report.x_raw = report.gyro_x;
_gyro_report.y_raw = report.gyro_y;
/* to align the sensor axes with the board, x and y need to be flipped */
_gyro_report.x_raw = report.gyro_y;
_gyro_report.y_raw = report.gyro_x;
/* z remains z and has the right sign */
_gyro_report.z_raw = report.gyro_z;
_gyro_report.x = report.gyro_x * _gyro_range_scale;
_gyro_report.y = report.gyro_y * _gyro_range_scale;
_gyro_report.x = report.gyro_y * _gyro_range_scale;
_gyro_report.y = report.gyro_x * _gyro_range_scale;
/* z remains z and has the right sign */
_gyro_report.z = report.gyro_z * _gyro_range_scale;
_gyro_report.scaling = _gyro_range_scale;
_gyro_report.range_rad_s = _gyro_range_rad_s;