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

Fix MAVLink not responding regression on TELEM2

Browse Source
This commit is contained in:
Lorenz Meier
2016-04-10 12:11:26 -07:00
parent d2c98a98e9
commit d97f32cca1
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+2 -6
View File
@@ -1758,9 +1758,7 @@ Mavlink::task_main(int argc, char *argv[])
mavlink_update_system();
/* start the MAVLink receiver */
if (_mode != MAVLINK_MODE_OSD) {
MavlinkReceiver::receive_start(&_receive_thread, this);
}
MavlinkReceiver::receive_start(&_receive_thread, this);
MavlinkOrbSubscription *param_sub = add_orb_subscription(ORB_ID(parameter_update));
uint64_t param_time = 0;
@@ -2125,9 +2123,7 @@ Mavlink::task_main(int argc, char *argv[])
}
/* first wait for threads to complete before tearing down anything */
if (_mode != MAVLINK_MODE_OSD) {
pthread_join(_receive_thread, NULL);
}
pthread_join(_receive_thread, NULL);
delete _subscribe_to_stream;
_subscribe_to_stream = nullptr;
src/modules/mavlink/mavlink_main.h
+1 -1
View File
@@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2016 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions