From f75c905d2593bf4e6d7d27702f63648cf8e49d10 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Sun, 11 Jun 2023 15:13:42 +1000
Subject: [PATCH] AP_RCProtocol: remove intermediate option_is_enabled methods
 for RC_Channel

---
 libraries/AP_RCProtocol/AP_RCProtocol.cpp         | 2 +-
 libraries/AP_RCProtocol/AP_RCProtocol_Backend.cpp | 4 ++--
 libraries/AP_RCProtocol/AP_RCProtocol_CRSF.cpp    | 2 +-
 libraries/AP_RCProtocol/AP_RCProtocol_CRSF.h      | 2 +-
 libraries/AP_RCProtocol/AP_RCProtocol_FPort.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.cpp b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
index d2af3e563e..4fead7fed5 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
@@ -93,7 +93,7 @@ AP_RCProtocol::~AP_RCProtocol()
 bool AP_RCProtocol::should_search(uint32_t now_ms) const
 {
 #if AP_RC_CHANNEL_ENABLED && !APM_BUILD_TYPE(APM_BUILD_UNKNOWN)
-    if (_detected_protocol != AP_RCProtocol::NONE && !rc().multiple_receiver_support()) {
+    if (_detected_protocol != AP_RCProtocol::NONE && !rc().option_is_enabled(RC_Channels::Option::MULTI_RECEIVER_SUPPORT)) {
         return false;
     }
 #else
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_Backend.cpp b/libraries/AP_RCProtocol/AP_RCProtocol_Backend.cpp
index de6cca8f5f..01b0fe9acb 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_Backend.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_Backend.cpp
@@ -82,7 +82,7 @@ void AP_RCProtocol_Backend::add_input(uint8_t num_values, uint16_t *values, bool
     // failsafed is sorted out in AP_IOMCU.cpp
     in_failsafe = false;
 #else
-    if (rc().ignore_rc_failsafe()) {
+    if (rc().option_is_enabled(RC_Channels::Option::IGNORE_FAILSAFE)) {
         in_failsafe = false;
     }
 #endif
@@ -179,7 +179,7 @@ void AP_RCProtocol_Backend::configure_vtx(uint8_t band, uint8_t channel, uint8_t
 void AP_RCProtocol_Backend::log_data(AP_RCProtocol::rcprotocol_t prot, uint32_t timestamp, const uint8_t *data, uint8_t len) const
 {
 #if HAL_LOGGING_ENABLED
-    if (rc().log_raw_data()) {
+    if (rc().option_is_enabled(RC_Channels::Option::LOG_RAW_DATA)) {
         uint32_t u32[10] {};
         if (len > sizeof(u32)) {
             len = sizeof(u32);
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.cpp b/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.cpp
index cd366a8cf7..20b632f8f9 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.cpp
@@ -306,7 +306,7 @@ void AP_RCProtocol_CRSF::update(void)
 
 #if AP_RC_CHANNEL_ENABLED
     //Check if LQ is to be reported in place of RSSI
-    _use_lq_for_rssi = bool(rc().use_crsf_lq_as_rssi());
+    _use_lq_for_rssi = rc().option_is_enabled(RC_Channels::Option::USE_CRSF_LQ_AS_RSSI);
 #endif
 }
 
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.h b/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.h
index f8a4314663..c063175e01 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.h
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_CRSF.h
@@ -48,7 +48,7 @@ public:
     // bootstrap baudrate
     uint32_t get_bootstrap_baud_rate() const {
 #if AP_RC_CHANNEL_ENABLED
-        return rc().use_420kbaud_for_elrs() ? ELRS_BAUDRATE : CRSF_BAUDRATE;
+        return rc().option_is_enabled(RC_Channels::Option::ELRS_420KBAUD) ? ELRS_BAUDRATE : CRSF_BAUDRATE;
 #else
         return CRSF_BAUDRATE;
 #endif
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_FPort.cpp b/libraries/AP_RCProtocol/AP_RCProtocol_FPort.cpp
index 9388f0cb14..a9037ad8f8 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_FPort.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_FPort.cpp
@@ -185,7 +185,7 @@ void AP_RCProtocol_FPort::decode_downlink(const FPort_Frame &frame)
     uint8_t len = 0;
     uint8_t buf2[sizeof(buf)*2+1];
 
-    if (rc().fport_pad()) {
+    if (rc().option_is_enabled(RC_Channels::Option::FPORT_PAD)) {
         // this padding helps on some uarts that have hw pullups
         buf2[len++] = 0xff;
     }