Merge branch '2.3' into 3djc/review-about

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)
@@ -53,6 +53,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})
   add_definitions(-DMANUFACTURER_FRSKY)
   if (${PCBREV} STREQUAL 2019)
@@ -106,6 +107,7 @@ elseif(PCB STREQUAL X9D)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS NO)
   add_definitions(-DMANUFACTURER_FRSKY)
+  set(AFHDS3 NO)
 elseif(PCB STREQUAL X7)
   set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
   set(HAPTIC YES)