Browse Source

MPU6K: Fix device ID

sbg
Lorenz Meier 8 years ago
parent
commit
71fa064bc7
  1. 11
      src/drivers/mpu6500/mpu6500.cpp

11
src/drivers/mpu6500/mpu6500.cpp

@ -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;
} }

Loading…
Cancel
Save