From dc102f7d0351b963a34100c021c0d39e7cc1e7c9 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 13 Nov 2021 16:50:48 +0100
Subject: [PATCH] Remove FLEX options (and make it default)

---
 radio/src/CMakeLists.txt              | 5 -----
 radio/src/gui/128x64/model_setup.cpp  | 3 +--
 radio/src/gui/212x64/model_setup.cpp  | 3 +--
 radio/src/gui/gui_common.cpp          | 8 --------
 radio/src/gui/gui_common.h            | 1 -
 radio/src/options.h                   | 3 ---
 radio/src/translations/untranslated.h | 4 ----
 7 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index bc0b5f177..5a741df79 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -50,7 +50,6 @@ option(NANO "Use nano newlib and binalloc")
 option(TEST_BUILD_WARNING "Warn this is a test build" OFF)
 option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
 option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON)
-option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF)
 option(MODULE_PROTOCOL_D8 "Add support for D8 modules" ON)
 option(FRSKY_RELEASE "Used to build FrSky released firmware" OFF)
 option(TBS_RELEASE "Used to build TBS released firmware" OFF)
@@ -418,10 +417,6 @@ if(MODULE_PROTOCOL_LBT)
   add_definitions(-DMODULE_PROTOCOL_LBT)
 endif()
 
-if(MODULE_PROTOCOL_FLEX)
-  add_definitions(-DMODULE_PROTOCOL_FLEX)
-endif()
-
 if(MODULE_PROTOCOL_D8)
   add_definitions(-DMODULE_PROTOCOL_D8)
 endif()
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 8a1b4dde5..6754d497e 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -960,8 +960,7 @@ void menuModelSetup(event_t event)
                                                                       g_model.moduleData[moduleIdx].subType,
                                                                       MODULE_SUBTYPE_R9M_FCC,
                                                                       MODULE_SUBTYPE_R9M_LAST,
-                                                                      EE_MODEL,
-                                                                      isR9MModeAvailable);
+                                                                      EE_MODEL);
                   if (checkIncDec_Ret) {
                     g_model.moduleData[moduleIdx].pxx.power = 0;
                     g_model.moduleData[moduleIdx].channelsStart = 0;
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 95bfbe4dc..1557e40ba 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -925,8 +925,7 @@ void menuModelSetup(event_t event)
 #endif
                 else if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
                   g_model.moduleData[EXTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].subType,
-                                                                            MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL,
-                                                                            isR9MModeAvailable);
+                                                                            MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL);
                 }
 #if defined(AFHDS3)
                 else if (isModuleAFHDS3(EXTERNAL_MODULE)) {
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 748b3a397..78254ac62 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -531,14 +531,6 @@ bool isSourceAvailableInResetSpecialFunction(int index)
   }
 }
 
-bool isR9MModeAvailable(int mode)
-{
-#if defined(MODULE_PROTOCOL_FLEX)
-  return true;
-#else
-  return mode <= MODULE_SUBTYPE_R9M_EU;
-#endif
-}
 
 #if defined(PXX2)
 bool isPxx2IsrmChannelsCountAllowed(int channels)
diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h
index b3158de2d..d5606cf89 100644
--- a/radio/src/gui/gui_common.h
+++ b/radio/src/gui/gui_common.h
@@ -92,7 +92,6 @@ bool isSwitchAvailableInLogicalSwitches(int swtch);
 bool isSwitchAvailableInCustomFunctions(int swtch);
 bool isSwitchAvailableInMixes(int swtch);
 bool isSwitchAvailableInTimers(int swtch);
-bool isR9MModeAvailable(int mode);
 bool isPxx2IsrmChannelsCountAllowed(int channels);
 bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType);
 bool isTrainerUsingModuleBay();
diff --git a/radio/src/options.h b/radio/src/options.h
index 4ca3fdb7b..36ee644b9 100644
--- a/radio/src/options.h
+++ b/radio/src/options.h
@@ -44,9 +44,6 @@ static const char * const options[] = {
 #if defined(FAI_CHOICE)
   "FAIchoice",
 #endif
-#if defined(MODULE_PROTOCOL_FLEX)
-  "flexr9m",
-#endif
 #if defined(AFHDS3)
   "afhds3",
 #endif
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index d1aa08ba6..c4754fb4c 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -93,11 +93,7 @@
 #define LEN_CRSF_BAUDRATE              "\005"
 #define TR_CRSF_BAUDRATE               "115k\0""400k\0""921k\0""1.87M""3.75M""5.25M"
 
-#if defined(MODULE_PROTOCOL_FLEX)
-#define TR_MODULE_R9M_LITE             "R9ML\0       "
-#else
 #define TR_MODULE_R9M_LITE             "R9MLite\0    "
-#endif
 
 #if defined(COLORLCD)
 #if defined(BOLD)