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

Merge branch 'master' of https://www.github.com/PX4/Firmware into getopt-cleanup-v2

Browse Source
This commit is contained in:
Mark Charlebois
2015-06-19 12:54:17 -07:00
parent f7fe6a037d 3627456dd6
commit 71fc3a96df
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
posix-configs/SITL/init/rcS
+2 -2
View File
@@ -7,8 +7,8 @@ dataman start
mavlink start -u 14556 -r 60000 mavlink start -u 14556 -r 60000
simulator start -s simulator start -s
param set CAL_GYRO0_ID 2293760 param set CAL_GYRO0_ID 2293760
param set CAL_ACC0_ID 1310720 param set CAL_ACC0_ID 1376256
param set CAL_ACC1_ID 1376256 param set CAL_ACC1_ID 1310720
param set CAL_MAG0_ID 196608 param set CAL_MAG0_ID 196608
param set CAL_GYRO0_XOFF 0.01 param set CAL_GYRO0_XOFF 0.01
param set CAL_ACC0_XOFF 0.01 param set CAL_ACC0_XOFF 0.01
src/drivers/device/vdev.cpp
+1
View File
@@ -324,6 +324,7 @@ VDev::ioctl(file_t *filep, int cmd, unsigned long arg)
case DEVIOCGDEVICEID: case DEVIOCGDEVICEID:
ret = (int)_device_id.devid; ret = (int)_device_id.devid;
PX4_INFO("IOCTL DEVIOCGDEVICEID %d", ret); PX4_INFO("IOCTL DEVIOCGDEVICEID %d", ret);
break;
default: default:
break; break;
} }
src/drivers/device/vdev_posix.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ int px4_ioctl(int fd, int cmd, unsigned long arg)
px4_errno = -ret; px4_errno = -ret;
} }
return (ret == 0) ? PX4_OK : PX4_ERROR; return ret;
} }
int px4_poll(px4_pollfd_struct_t *fds, nfds_t nfds, int timeout) int px4_poll(px4_pollfd_struct_t *fds, nfds_t nfds, int timeout)