Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 12:30:27 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

MPU6K: Fix device ID

Browse Source
This commit is contained in:
Lorenz Meier
2017-01-17 12:06:14 +01:00
parent 171c321acc
commit 71fa064bc7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/mpu6500/mpu6500.cpp
+5 -6
View File
@@ -1833,8 +1833,8 @@ MPU6500::measure()
arb.temperature_raw = report.temp; arb.temperature_raw = report.temp;
arb.temperature = _last_temperature; arb.temperature = _last_temperature;
/* Return class instance as a surrogate device ID */ /* return device ID */
arb.device_id = _accel_class_instance; arb.device_id = _device_id;
grb.x_raw = report.gyro_x; grb.x_raw = report.gyro_x;
grb.y_raw = report.gyro_y; grb.y_raw = report.gyro_y;
@@ -1869,9 +1869,8 @@ MPU6500::measure()
grb.temperature_raw = report.temp; grb.temperature_raw = report.temp;
grb.temperature = _last_temperature; grb.temperature = _last_temperature;
/* Use class instance as a surrogate hardware ID */ /* return device ID */
grb.device_id = _gyro->_gyro_class_instance; grb.device_id = _gyro->_device_id;
grb.device_id = 0;
_accel_reports->force(&arb); _accel_reports->force(&arb);
_gyro_reports->force(&grb); _gyro_reports->force(&grb);
@@ -2091,7 +2090,7 @@ start(bool external_bus, enum Rotation rotation, int range)
fail: fail:
if (*g_dev_ptr != nullptr) { if (*g_dev_ptr != nullptr) {
delete(*g_dev_ptr); delete *g_dev_ptr;
*g_dev_ptr = nullptr; *g_dev_ptr = nullptr;
} }