From 703dd7ee1b06873727d8a5dc44055714307f72a0 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Fri, 27 Nov 2020 10:30:30 +0100
Subject: [PATCH] Review AFHDS3 option

---
 companion/src/firmwares/opentx/opentxinterface.cpp | 12 ++++++------
 radio/src/targets/taranis/CMakeLists.txt           |  4 +++-
 radio/util/build-firmware.py                       |  3 ---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 2e35c51db..04f02eb29 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1202,19 +1202,19 @@ void registerOpenTxFirmwares()
   firmware->addOption("horussticks", Firmware::tr("Horus gimbals installed (Hall sensors)"));
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, EU + FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, EU + FLEX);
 
   /* FrSky X9-Lite board */
   firmware = new OpenTxFirmware("opentx-x9lite", Firmware::tr("FrSky Taranis X9-Lite"), BOARD_TARANIS_X9LITE);
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* FrSky X9-LiteS board */
   firmware = new OpenTxFirmware("opentx-x9lites", Firmware::tr("FrSky Taranis X9-Lite S"), BOARD_TARANIS_X9LITES);
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* FrSky X7 board */
   firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
@@ -1232,7 +1232,7 @@ void registerOpenTxFirmwares()
   firmware = new OpenTxFirmware("opentx-xlites", Firmware::tr("FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES);
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* FrSky X-Lite board */
   firmware = new OpenTxFirmware("opentx-xlite", Firmware::tr("FrSky Taranis X-Lite"), BOARD_TARANIS_XLITE);
@@ -1273,7 +1273,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("internalmulti", Firmware::tr("Support for MULTI internal module"));
   addOpenTxFontOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* Jumper T16 board */
   firmware = new OpenTxFirmware("opentx-t16", Firmware::tr("Jumper T16 / T16+ / T16 Pro"), BOARD_JUMPER_T16);
@@ -1292,7 +1292,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
   addOpenTxFontOptions(firmware);
   registerOpenTxFirmware(firmware);
-  addOpenTxRfOptions(firmware, FLEX + AFHDS3);
+  addOpenTxRfOptions(firmware, FLEX);
 
   /* Radiomaster TX16S board */
   firmware = new OpenTxFirmware("opentx-tx16s", Firmware::tr("Radiomaster TX16S / SE / Hall / Masterfire"), BOARD_RADIOMASTER_TX16S);
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
index e7c2be86d..20a71ade2 100644
--- a/radio/src/targets/taranis/CMakeLists.txt
+++ b/radio/src/targets/taranis/CMakeLists.txt
@@ -2,7 +2,7 @@ option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
 option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
 option(PXX1 "PXX1 protocol support" ON)
 option(PXX2 "PXX2 protocol support" OFF)
-option(AFHDS3 "AFHDS3 TX Module" OFF)
+option(AFHDS3 "AFHDS3 TX Module" ON)
 option(GHOST "Ghost TX Module" ON)
 option(INTERNAL_MODULE_PPM "Support for PPM internal module" OFF)
 option(AUTOUPDATE "Auto update internal chips from SD" OFF)
@@ -52,6 +52,7 @@ elseif(PCB STREQUAL X9D+)
   set(LCD_DRIVER lcd_driver_spi.cpp)
   set(GVAR_SCREEN model_gvars.cpp)
   set(PCBREV 2014 CACHE STRING "PCB Revision")
+  set(AFHDS3 NO)
   add_definitions(-DPCBREV=${PCBREV})
   if (${PCBREV} STREQUAL 2019)
     option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF)
@@ -103,6 +104,7 @@ elseif(PCB STREQUAL X9D)
   set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS NO)
+  set(AFHDS3 NO)
 elseif(PCB STREQUAL X7)
   set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
   set(HAPTIC YES)
diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py
index 907e358dd..66d9f053d 100755
--- a/radio/util/build-firmware.py
+++ b/radio/util/build-firmware.py
@@ -93,13 +93,11 @@ def main():
         maxsize = 65536 * 8
     elif options[optcount] == "x7":
         cmake_options["PCB"] = "X7"
-        cmake_options["AFHDS3"] = "YES"
         firmware_options = options_taranis_x7
         maxsize = 65536 * 8
     elif options[optcount] == "x7access":
         cmake_options["PCB"] = "X7"
         cmake_options["PCBREV"] = "ACCESS"
-        cmake_options["AFHDS3"] = "YES"
         firmware_options = options_taranis_x7
         maxsize = 65536 * 8
     elif board_name == "xlite":
@@ -121,7 +119,6 @@ def main():
     elif board_name == "x9d+2019":
         cmake_options["PCB"] = "X9D+"
         cmake_options["PCBREV"] = "2019"
-        cmake_options["AFHDS3"] = "YES"
         firmware_options = options_taranis_x9dp
         maxsize = 65536 * 8
     elif board_name == "x9e":