Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: eliminate get_mavlink_channel 

there's no dependence on any SerialManager stuff when determining this.  The protocol passed through was always mavlink...
This commit is contained in:
Peter Barker 2022-07-11 14:43:18 +10:00 committed by Andrew Tridgell
parent 8ab0c03ada
commit d768bcc904
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -119,15 +119,13 @@ bool GCS_MAVLINK::init(uint8_t instance)
const AP_SerialManager::SerialProtocol protocol = AP_SerialManager::SerialProtocol_MAVLink;
// get associated mavlink channel
if (!serial_manager.get_mavlink_channel(protocol, instance, chan)) {
// return immediately in unlikely case mavlink channel cannot be found
return false;
}
// and init the gcs instance
chan = (mavlink_channel_t)(MAVLINK_COMM_0 + instance);
if (!valid_channel(chan)) {
return false;
}
// and init the gcs instance
if (!serial_manager.should_forward_mavlink_telemetry(protocol, instance)) {
set_channel_private(chan);
}