From fc5fbc98999b0a4f42bdf292b5db28bdba89083c Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Thu, 16 Apr 2020 17:03:17 +0200
Subject: [PATCH] Multi_Names update for OpenTX

---
 Multiprotocol/Multi_Names.ino | 18 ++++++++++--------
 Multiprotocol/Validate.h      |  6 ++++++
 Multiprotocol/_Config.h       |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino
index a62f4cb..9dfb7d7 100644
--- a/Multiprotocol/Multi_Names.ino
+++ b/Multiprotocol/Multi_Names.ino
@@ -208,15 +208,13 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(FQ777_NRF24L01_INO)
 		{PROTO_FQ777,      STR_FQ777,     0, NO_SUBTYPE,            OPTION_NONE    },
 	#endif
+//OpenTX 2.3.x issue: DO NOT CHANGE ORDER below
+	#if defined(FRSKY_RX_CC2500_INO)
+		{PROTO_FRSKY_RX,   STR_FRSKY_RX,  2, STR_SUBTYPE_FRSKY_RX,  OPTION_RFTUNE  },
+	#endif
 	#if defined(FRSKYD_CC2500_INO)
 		{PROTO_FRSKYD,     STR_FRSKYD,    2, STR_SUBTYPE_FRSKYD,    OPTION_RFTUNE  },
 	#endif
-	#if defined(FRSKYL_CC2500_INO)
-		{PROTO_FRSKYL,     STR_FRSKYL,    2, STR_SUBTYPE_FRSKYL,    OPTION_RFTUNE  },
-	#endif
-	#if defined(FRSKYR9_SX1276_INO)
-		{PROTO_FRSKY_R9,   STR_FRSKYR9,   4, STR_SUBTYPE_FRSKYR9,   OPTION_NONE  },
-	#endif
 	#if defined(FRSKYV_CC2500_INO)
 		{PROTO_FRSKYV,      STR_FRSKYV,   0, NO_SUBTYPE,            OPTION_RFTUNE  },
 	#endif
@@ -224,8 +222,12 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_FRSKYX,     STR_FRSKYX,    5, STR_SUBTYPE_FRSKYX,    OPTION_RFTUNE  },
 		{PROTO_FRSKYX2,    STR_FRSKYX2,   5, STR_SUBTYPE_FRSKYX,    OPTION_RFTUNE  },
 	#endif
-	#if defined(FRSKY_RX_CC2500_INO)
-		{PROTO_FRSKY_RX,   STR_FRSKY_RX,  2, STR_SUBTYPE_FRSKY_RX,  OPTION_RFTUNE  },
+//OpenTX 2.3.x issue: DO NOT CHANGE ORDER above
+	#if defined(FRSKYL_CC2500_INO)
+		{PROTO_FRSKYL,     STR_FRSKYL,    2, STR_SUBTYPE_FRSKYL,    OPTION_RFTUNE  },
+	#endif
+	#if defined(FRSKYR9_SX1276_INO)
+		{PROTO_FRSKY_R9,   STR_FRSKYR9,   4, STR_SUBTYPE_FRSKYR9,   OPTION_NONE  },
 	#endif
 	#if defined(FX816_NRF24L01_INO)
 		{PROTO_FX816,      STR_FX816,     1, STR_SUBTYPE_FX816,     OPTION_NONE    },
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 3a92aa9..3916001 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -265,6 +265,12 @@
 	#undef FRSKYR9_SX1276_INO
 #endif
 
+//OpenTX 2.3.x issue
+#if defined (FRSKYD_CC2500_INO) || defined(FRSKYV_CC2500_INO) || defined(FRSKYX_CC2500_INO)
+	#define	FRSKYX_CC2500_INO
+	#define	FRSKY_RX_CC2500_INO
+#endif
+
 //Make sure telemetry is selected correctly
 #ifndef TELEMETRY
 	#undef INVERT_TELEMETRY
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index b767443..9ef2272 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -176,8 +176,8 @@
 
 //The protocols below need a CC2500 to be installed
 #define	CORONA_CC2500_INO
-#define	FRSKYD_CC2500_INO
 #define	FRSKYL_CC2500_INO
+#define	FRSKYD_CC2500_INO
 #define	FRSKYV_CC2500_INO
 #define	FRSKYX_CC2500_INO
 #define	FRSKY_RX_CC2500_INO