Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-01 13:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: revert removal of private channel check when forwarding

Browse Source 
This reverts 6dc77c97ce

The commit caused a regression on Solo as the gimbal is "nodding",
indicating traffic from the autopilot is getting through to the gimbal.
This commit is contained in:
Peter Barker 2020-08-23 13:20:27 +10:00 committed by Peter Barker
parent 8e6cde25dc
commit 0c88af99da
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/GCS_MAVLink/MAVLink_routing.cpp
View File

@ -145,6 +145,13 @@ bool MAVLink_routing::check_and_forward(mavlink_channel_t in_channel, const mavl
memset(sent_to_chan, 0, sizeof(sent_to_chan));
for (uint8_t i=0; i<num_routes; i++) {
// Skip if channel is private and the target system or component IDs do not match
if ((GCS_MAVLINK::is_private(routes[i].channel)) &&
(target_system != routes[i].sysid ||
target_component != routes[i].compid)) {
continue;
}
if (broadcast_system || (target_system == routes[i].sysid &&
(broadcast_component ||
target_component == routes[i].compid ||