Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_SerialManager: eliminate get_mavlink_channel

Browse Source 
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 38119e17c7
commit 8ab0c03ada
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_SerialManager/AP_SerialManager.cpp
View File

@ -643,22 +643,6 @@ int8_t AP_SerialManager::find_portnum(enum SerialProtocol protocol, uint8_t inst
return int8_t(_state - &state[0]); return int8_t(_state - &state[0]);
} }
// get_mavlink_channel - provides the mavlink channel associated with a given protocol
// instance should be zero if searching for the first instance, 1 for the second, etc
// returns true if a channel is found, false if not
bool AP_SerialManager::get_mavlink_channel(enum SerialProtocol protocol, uint8_t instance, mavlink_channel_t &mav_chan) const
{
// check for MAVLink
if (protocol_match(protocol, SerialProtocol_MAVLink)) {
if (instance < MAVLINK_COMM_NUM_BUFFERS) {
mav_chan = (mavlink_channel_t)(MAVLINK_COMM_0 + instance);
return true;
}
}
// report failure
return false;
}
// should_forward_mavlink_telemetry - returns true if this port should forward telemetry // should_forward_mavlink_telemetry - returns true if this port should forward telemetry
bool AP_SerialManager::should_forward_mavlink_telemetry(enum SerialProtocol protocol, uint8_t instance) const bool AP_SerialManager::should_forward_mavlink_telemetry(enum SerialProtocol protocol, uint8_t instance) const
{ {

5
libraries/AP_SerialManager/AP_SerialManager.h
View File

@ -201,11 +201,6 @@ public:
// find_portnum - find port number (SERIALn index) for a protocol and instance, -1 for not found // find_portnum - find port number (SERIALn index) for a protocol and instance, -1 for not found
int8_t find_portnum(enum SerialProtocol protocol, uint8_t instance) const; int8_t find_portnum(enum SerialProtocol protocol, uint8_t instance) const;
// get_mavlink_channel - provides the mavlink channel associated with a given protocol (and instance)
// instance should be zero if searching for the first instance, 1 for the second, etc
// returns true if a channel is found, false if not
bool get_mavlink_channel(enum SerialProtocol protocol, uint8_t instance, mavlink_channel_t &mav_chan) const;
// should_forward_mavlink_telemetry - returns true if this port should forward telemetry // should_forward_mavlink_telemetry - returns true if this port should forward telemetry
bool should_forward_mavlink_telemetry(enum SerialProtocol protocol, uint8_t instance) const; bool should_forward_mavlink_telemetry(enum SerialProtocol protocol, uint8_t instance) const;