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

Merge branch 'master' into px4io_fix

Browse Source
This commit is contained in:
Lorenz Meier
2013-10-13 12:25:46 +02:00
parent e770f84858 4a4834c3de
commit c8f471c560
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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].fd = _io_fd;
fds[0].events = POLLIN; fds[0].events = POLLIN;
/* wait 100 ms for a character */ /* wait <timout> ms for a character */
int ret = ::poll(&fds[0], 1, timeout); int ret = ::poll(&fds[0], 1, timeout);
if (ret < 1) { if (ret < 1) {