aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_RCProtocol: remove duplicated definition from protocol_detected

Browse Source
This commit is contained in:
Mirko Denecke 2019-10-26 22:46:21 +02:00 committed by Andrew Tridgell
parent 88fa7eee6e
commit fe46dc34d4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_RCProtocol/AP_RCProtocol.h
View File

@ -57,11 +57,7 @@ public:
bool requires_3_frames(enum rcprotocol_t p) { bool requires_3_frames(enum rcprotocol_t p) {
return (p == DSM || p == SBUS || p == SBUS_NI || p == PPM); return (p == DSM || p == SBUS || p == SBUS_NI || p == PPM);
} }
enum rcprotocol_t protocol_detected()
{
return _detected_protocol;
}
uint8_t num_channels(); uint8_t num_channels();
uint16_t read(uint8_t chan); uint16_t read(uint8_t chan);
bool new_input(); bool new_input();
@ -73,7 +69,7 @@ public:
// return protocol name as a string // return protocol name as a string
const char *protocol_name(void) const; const char *protocol_name(void) const;
// return protocol name as a string // return detected protocol
enum rcprotocol_t protocol_detected(void) const { enum rcprotocol_t protocol_detected(void) const {
return _detected_protocol; return _detected_protocol;
} }