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

Merge remote-tracking branch 'px4/master' into pwm_ioctls

Browse Source 
Conflicts:
	src/drivers/px4io/px4io.cpp
This commit is contained in:
Julian Oes
2013-10-19 11:39:31 +02:00
parent ba77836000 9b22de147c
commit 70ec68ffd0
57 changed files with 1914 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/px4io/px4io.cpp
+386 -268
View File
File diff suppressed because it is too large Load Diff
src/drivers/px4io/px4io_uploader.cpp
+1 -1
View File
@@ -237,7 +237,7 @@ PX4IO_Uploader::recv(uint8_t &c, unsigned timeout)
fds[0].fd = _io_fd;
fds[0].events = POLLIN;
/* wait 100 ms for a character */
/* wait <timout> ms for a character */
int ret = ::poll(&fds[0], 1, timeout);
if (ret < 1) {