From 1b040fa0c3678dfae9f45f5d29576a5665293238 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 16 May 2023 11:55:57 +1000
Subject: [PATCH] AP_RCProtocol: add separate define for
 AP_RCPROTOCOL_PPMSUM_ENABLED

---
 libraries/AP_RCProtocol/AP_RCProtocol.cpp        | 8 ++++++--
 libraries/AP_RCProtocol/AP_RCProtocol.h          | 8 ++++++--
 libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.cpp | 4 ++--
 libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.h   | 4 ++--
 libraries/AP_RCProtocol/AP_RCProtocol_config.h   | 4 ++++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.cpp b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
index 8b3756186a..3d457332c2 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
@@ -41,7 +41,9 @@ extern const AP_HAL::HAL& hal;
 
 void AP_RCProtocol::init()
 {
-    backend[AP_RCProtocol::PPM] = new AP_RCProtocol_PPMSum(*this);
+#if AP_RCPROTOCOL_PPMSUM_ENABLED
+    backend[AP_RCProtocol::PPMSUM] = new AP_RCProtocol_PPMSum(*this);
+#endif
     backend[AP_RCProtocol::IBUS] = new AP_RCProtocol_IBUS(*this);
 #if AP_RCPROTOCOL_SBUS_ENABLED
     backend[AP_RCProtocol::SBUS] = new AP_RCProtocol_SBUS(*this, true, 100000);
@@ -421,8 +423,10 @@ void AP_RCProtocol::start_bind(void)
 const char *AP_RCProtocol::protocol_name_from_protocol(rcprotocol_t protocol)
 {
     switch (protocol) {
-    case PPM:
+#if AP_RCPROTOCOL_PPMSUM_ENABLED
+    case PPMSUM:
         return "PPM";
+#endif
     case IBUS:
         return "IBUS";
 #if AP_RCPROTOCOL_SBUS_ENABLED
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.h b/libraries/AP_RCProtocol/AP_RCProtocol.h
index 54fd104b9e..b6bbdbcc85 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol.h
+++ b/libraries/AP_RCProtocol/AP_RCProtocol.h
@@ -30,7 +30,9 @@ class AP_RCProtocol {
 public:
 
     enum rcprotocol_t {
-        PPM        =  0,
+#if AP_RCPROTOCOL_PPMSUM_ENABLED
+        PPMSUM     =  0,
+#endif
         IBUS       =  1,
 #if AP_RCPROTOCOL_SBUS_ENABLED
         SBUS       =  2,
@@ -109,7 +111,9 @@ public:
 #if AP_RCPROTOCOL_SBUS_NI_ENABLED
         case SBUS_NI:
 #endif
-        case PPM:
+#if AP_RCPROTOCOL_PPMSUM_ENABLED
+        case PPMSUM:
+#endif
 #if AP_RCPROTOCOL_FPORT_ENABLED
         case FPORT:
 #endif
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.cpp b/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.cpp
index 5df42ae5a8..93bb5cb5d4 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.cpp
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.cpp
@@ -17,7 +17,7 @@
 
 #include "AP_RCProtocol_PPMSum.h"
 
-#if AP_RCPROTOCOL_ENABLED
+#if AP_RCPROTOCOL_PPMSUM_ENABLED
 
 /*
   process a PPM-sum pulse of the given width
@@ -66,4 +66,4 @@ void AP_RCProtocol_PPMSum::process_pulse(uint32_t width_s0, uint32_t width_s1)
     }
 }
 
-#endif  // AP_RCPROTOCOL_ENABLED
+#endif  // AP_RCPROTOCOL_PPMSUM_ENABLED
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.h b/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.h
index 74aa78d371..fd6909b709 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.h
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_PPMSum.h
@@ -18,7 +18,7 @@
 
 #include "AP_RCProtocol_config.h"
 
-#if AP_RCPROTOCOL_ENABLED
+#if AP_RCPROTOCOL_PPMSUM_ENABLED
 
 #include "AP_RCProtocol_Backend.h"
 
@@ -34,4 +34,4 @@ private:
     } ppm_state;
 };
 
-#endif  // AP_RCPROTOCOL_ENABLED
+#endif  // AP_RCPROTOCOL_PPMSUM_ENABLED
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_config.h b/libraries/AP_RCProtocol/AP_RCProtocol_config.h
index c1e5f766bf..3260387aed 100644
--- a/libraries/AP_RCProtocol/AP_RCProtocol_config.h
+++ b/libraries/AP_RCProtocol/AP_RCProtocol_config.h
@@ -22,6 +22,10 @@
 #define AP_RCPROTOCOL_FPORT2_ENABLED AP_RCPROTOCOL_BACKEND_DEFAULT_ENABLED && AP_FRSKY_SPORT_TELEM_ENABLED
 #endif
 
+#ifndef AP_RCPROTOCOL_PPMSUM_ENABLED
+#define AP_RCPROTOCOL_PPMSUM_ENABLED AP_RCPROTOCOL_BACKEND_DEFAULT_ENABLED
+#endif
+
 #ifndef AP_RCPROTOCOL_SBUS_ENABLED
 #define AP_RCPROTOCOL_SBUS_ENABLED AP_RCPROTOCOL_BACKEND_DEFAULT_ENABLED
 #endif