Browse Source

AP_RCProtocol: expose protocol name mapping

master
Andrew Tridgell 6 years ago
parent
commit
a8e6a09903
  1. 12
      libraries/AP_RCProtocol/AP_RCProtocol.cpp
  2. 9
      libraries/AP_RCProtocol/AP_RCProtocol.h

12
libraries/AP_RCProtocol/AP_RCProtocol.cpp

@ -198,9 +198,9 @@ void AP_RCProtocol::start_bind(void) @@ -198,9 +198,9 @@ void AP_RCProtocol::start_bind(void)
/*
return protocol name
*/
const char *AP_RCProtocol::protocol_name(void) const
const char *AP_RCProtocol::protocol_name_from_protocol(rcprotocol_t protocol)
{
switch (_detected_protocol) {
switch (protocol) {
case PPM:
return "PPM";
case SBUS:
@ -219,3 +219,11 @@ const char *AP_RCProtocol::protocol_name(void) const @@ -219,3 +219,11 @@ const char *AP_RCProtocol::protocol_name(void) const
}
return nullptr;
}
/*
return protocol name
*/
const char *AP_RCProtocol::protocol_name(void) const
{
return protocol_name_from_protocol(_detected_protocol);
}

9
libraries/AP_RCProtocol/AP_RCProtocol.h

@ -29,6 +29,7 @@ public: @@ -29,6 +29,7 @@ public:
instance = this;
}
~AP_RCProtocol();
enum rcprotocol_t {
PPM = 0,
SBUS,
@ -66,9 +67,17 @@ public: @@ -66,9 +67,17 @@ public:
bool new_input();
void start_bind(void);
// return protocol name as a string
static const char *protocol_name_from_protocol(rcprotocol_t protocol);
// return protocol name as a string
const char *protocol_name(void) const;
// return protocol name as a string
enum rcprotocol_t protocol_detected(void) const {
return _detected_protocol;
}
// access to singleton
static AP_RCProtocol *get_instance(void) {
return instance;

Loading…
Cancel
Save