Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 20:28:37 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Driver compile fixes

Browse Source
This commit is contained in:
Lorenz Meier
2017-01-17 12:11:16 +01:00
parent 71fa064bc7
commit 7326fea142
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/l3gd20/l3gd20.cpp
+1 -1
View File
@@ -1076,7 +1076,7 @@ L3GD20::measure()
report.range_rad_s = _gyro_range_rad_s; report.range_rad_s = _gyro_range_rad_s;
/* return device ID */ /* return device ID */
report.device_id = _device_id; report.device_id = _device_id.devid;
_reports->force(&report); _reports->force(&report);
src/drivers/lsm303d/lsm303d.cpp
+2 -2
View File
@@ -1643,7 +1643,7 @@ LSM303D::measure()
accel_report.range_m_s2 = _accel_range_m_s2; accel_report.range_m_s2 = _accel_range_m_s2;
/* return device ID */ /* return device ID */
accel_report.device_id = _device_id; accel_report.device_id = _device_id.devid;
_accel_reports->force(&accel_report); _accel_reports->force(&accel_report);
@@ -1729,7 +1729,7 @@ LSM303D::mag_measure()
*/ */
_last_temperature = 25 + (raw_mag_report.temperature * 0.125f); _last_temperature = 25 + (raw_mag_report.temperature * 0.125f);
mag_report.temperature = _last_temperature; mag_report.temperature = _last_temperature;
mag_report.device_id = _mag->_device_id; mag_report.device_id = _mag->_device_id.devid;
_mag_reports->force(&mag_report); _mag_reports->force(&mag_report);
src/drivers/mpu6000/mpu6000.cpp
+2 -2
View File
@@ -2031,7 +2031,7 @@ MPU6000::measure()
arb.temperature = _last_temperature; arb.temperature = _last_temperature;
/* return device ID */ /* return device ID */
arb.device_id = _device_id; arb.device_id = _device_id.devid;
grb.x_raw = report.gyro_x; grb.x_raw = report.gyro_x;
grb.y_raw = report.gyro_y; grb.y_raw = report.gyro_y;
@@ -2067,7 +2067,7 @@ MPU6000::measure()
grb.temperature = _last_temperature; grb.temperature = _last_temperature;
/* return device ID */ /* return device ID */
grb.device_id = _gyro->_device_id; grb.device_id = _gyro->_device_id.devid;
_accel_reports->force(&arb); _accel_reports->force(&arb);
_gyro_reports->force(&grb); _gyro_reports->force(&grb);
src/drivers/ms5611/ms5611.cpp
+1 -1
View File
@@ -763,7 +763,7 @@ MS5611::collect()
report.pressure = P / 100.0f; /* convert to millibar */ report.pressure = P / 100.0f; /* convert to millibar */
/* return device ID */ /* return device ID */
report.device_id = _device_id; report.device_id = _device_id.devid;
/* altitude calculations based on http://www.kansasflyer.org/index.asp?nav=Avi&sec=Alti&tab=Theory&pg=1 */ /* altitude calculations based on http://www.kansasflyer.org/index.asp?nav=Avi&sec=Alti&tab=Theory&pg=1 */