From fe46dc34d4ac0688bf99bed5f14a0dac206e6d39 Mon Sep 17 00:00:00 2001 From: Mirko Denecke Date: Sat, 26 Oct 2019 22:46:21 +0200 Subject: [PATCH] AP_RCProtocol: remove duplicated definition from protocol_detected --- libraries/AP_RCProtocol/AP_RCProtocol.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.h b/libraries/AP_RCProtocol/AP_RCProtocol.h index a1e68513ab..cc2e65ec31 100644 --- a/libraries/AP_RCProtocol/AP_RCProtocol.h +++ b/libraries/AP_RCProtocol/AP_RCProtocol.h @@ -57,11 +57,7 @@ public: bool requires_3_frames(enum rcprotocol_t p) { return (p == DSM || p == SBUS || p == SBUS_NI || p == PPM); } - - enum rcprotocol_t protocol_detected() - { - return _detected_protocol; - } + uint8_t num_channels(); uint16_t read(uint8_t chan); bool new_input(); @@ -73,7 +69,7 @@ public: // return protocol name as a string const char *protocol_name(void) const; - // return protocol name as a string + // return detected protocol enum rcprotocol_t protocol_detected(void) const { return _detected_protocol; }