yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged

Browse Source
This commit is contained in:
Lorenz Meier
2015-09-20 15:06:27 +02:00
parent d2459a1c8d
commit 985243c932
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/simulator/simulator_mavlink.cpp
View File

@@ -458,10 +458,15 @@ void Simulator::pollForMAVLinkMessages(bool publish)
char serial_buf[1024]; char serial_buf[1024];
struct pollfd fds[2]; struct pollfd fds[2];
unsigned fd_count = 1;
fds[0].fd = _fd; fds[0].fd = _fd;
fds[0].events = POLLIN; fds[0].events = POLLIN;
fds[1].fd = serial_fd;
fds[1].events = POLLIN; if (serial_fd >= 0) {
fds[1].fd = serial_fd;
fds[1].events = POLLIN;
fd_count++;
}
int len = 0; int len = 0;
@@ -496,7 +501,7 @@ void Simulator::pollForMAVLinkMessages(bool publish)
// wait for new mavlink messages to arrive // wait for new mavlink messages to arrive
while (true) { while (true) {
pret = ::poll(&fds[0], (sizeof(fds) / sizeof(fds[0])), 100); pret = ::poll(&fds[0], fd_count, 100);
//timed out //timed out
if (pret == 0) { if (pret == 0) {