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

Updated to latest DriverFramework

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-11-16 11:59:30 -08:00
parent 1fa20819d8
commit 40b488d693
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/drivers/accelsim/accelsim.cpp
+4 -4
View File
@@ -1110,13 +1110,13 @@ start(enum Rotation rotation)
DevMgr::getHandle(ACCELSIM_DEVICE_PATH_MAG, h_mag); DevMgr::getHandle(ACCELSIM_DEVICE_PATH_MAG, h_mag);
/* don't fail if mag dev cannot be opened */ /* don't fail if mag dev cannot be opened */
if (!h_mag.isValid()) { if (h_mag.isValid()) {
if (h.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) { if (h_mag.ioctl(SENSORIOCSPOLLRATE, (void *)SENSOR_POLLRATE_DEFAULT) < 0) {
PX4_ERR("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_ACCEL); PX4_ERR("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_MAG);
} }
} else { } else {
PX4_ERR("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_ACCEL); PX4_ERR("ioctl SENSORIOCSPOLLRATE %s failed", ACCELSIM_DEVICE_PATH_MAG);
} }
DevMgr::releaseHandle(h); DevMgr::releaseHandle(h);
src/platforms/posix/drivers/gyrosim/gyrosim.cpp
+2 -1
View File
@@ -1169,7 +1169,8 @@ GYROSIM_gyro::GYROSIM_gyro(GYROSIM *parent, const char *path) :
int int
GYROSIM_gyro::init() GYROSIM_gyro::init()
{ {
return start(); int ret = VirtDevObj::init();
return ret ? ret : start();
} }
void void