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

navigator: mavlink reopening fixed

Browse Source
This commit is contained in:
Anton Babushkin
2013-12-31 13:10:35 +04:00
parent d35a169907
commit 2e6cd18615
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/navigator_main.cpp
+8 -5
View File
@@ -497,11 +497,14 @@ Navigator::task_main_trampoline(int argc, char *argv[])
void void
Navigator::task_main() Navigator::task_main()
{ {
/* inform about start */ /* inform about start */
warnx("Initializing.."); warnx("Initializing..");
fflush(stdout); fflush(stdout);
_mavlink_fd = open(MAVLINK_LOG_DEVICE, 0);
mavlink_log_info(_mavlink_fd, "[navigator] started");
_fence_valid = load_fence(GEOFENCE_MAX_VERTICES); _fence_valid = load_fence(GEOFENCE_MAX_VERTICES);
/* /*
@@ -530,7 +533,7 @@ Navigator::task_main()
unsigned prevState = NAV_STATE_NONE; unsigned prevState = NAV_STATE_NONE;
bool pub_control_mode = true; bool pub_control_mode = true;
hrt_abstime mavlink_open_time = 0; hrt_abstime mavlink_open_time = 0;
const hrt_abstime mavlink_open_period = 500000000; const hrt_abstime mavlink_open_interval = 500000;
/* wakeup source(s) */ /* wakeup source(s) */
struct pollfd fds[7]; struct pollfd fds[7];
@@ -569,9 +572,9 @@ Navigator::task_main()
perf_begin(_loop_perf); perf_begin(_loop_perf);
if (_mavlink_fd < 0 && hrt_absolute_time() > mavlink_open_time + mavlink_open_period) { if (_mavlink_fd < 0 && hrt_absolute_time() > mavlink_open_time) {
/* try to open the mavlink log device every once in a while */ /* try to reopen the mavlink log device with specified interval */
mavlink_open_time = hrt_abstime(); mavlink_open_time = hrt_abstime() + mavlink_open_interval;
_mavlink_fd = open(MAVLINK_LOG_DEVICE, 0); _mavlink_fd = open(MAVLINK_LOG_DEVICE, 0);
} }