dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

MPU6K: Device ID should come from the main instance, not interface

This commit is contained in:
Lorenz Meier 2017-01-29 16:21:04 +01:00
parent be2c73e9c3
commit a9a31bc745
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/mpu6000/mpu6000.cpp
View File

@ -567,6 +567,9 @@ MPU6000::MPU6000(device::Device *interface, const char *path_accel, const char *
break;
}
// copy device type to interface
_interface->set_device_type(_device_id.devid_s.devtype);
// default accel scale factors
_accel_scale.x_offset = 0;
_accel_scale.x_scale = 1.0f;
@ -1523,9 +1526,6 @@ MPU6000::ioctl(struct file *filp, int cmd, unsigned long arg)
case ACCELIOCGEXTERNAL:
return _interface->ioctl(cmd, dummy);
case DEVIOCGDEVICEID:
return _interface->ioctl(cmd, dummy);
default:
/* give it to the superclass */
return CDev::ioctl(filp, cmd, arg);
@ -1610,9 +1610,6 @@ MPU6000::gyro_ioctl(struct file *filp, int cmd, unsigned long arg)
case GYROIOCGEXTERNAL:
return _interface->ioctl(cmd, dummy);
case DEVIOCGDEVICEID:
return _interface->ioctl(cmd, dummy);
default:
/* give it to the superclass */
return CDev::ioctl(filp, cmd, arg);