Cosmetics

radio/src/targets/common/arm/stm32/bluetooth_driver.cpp

@@ -24,9 +24,7 @@
 Fifo<uint8_t, BT_TX_FIFO_SIZE> btTxFifo;
 Fifo<uint8_t, BT_RX_FIFO_SIZE> btRxFifo;
 
-#if defined(PCBX7ACCESS)
-//nothing to do
-#elif defined(PCBX7) || defined(PCBXLITE)
+#if defined(BLUETOOTH_PROBE)
 volatile uint8_t btChipPresent = 0;
 #endif
 
@@ -119,9 +117,7 @@ extern "C" void BT_USART_IRQHandler(void)
     uint8_t byte = USART_ReceiveData(BT_USART);
     btRxFifo.push(byte);
     TRACE("BT %02X", byte);
-#if defined(PCBX7ACCESS)
-    //nothing to do
-#elif defined(PCBX7) || defined(PCBXLITE)
+#if defined(BLUETOOTH_PROBE)
     if (!btChipPresent) {
       // This is to differentiate X7 and X7S and X-Lite with/without BT
       btChipPresent = 1;

radio/src/targets/taranis/CMakeLists.txt

@@ -36,6 +36,8 @@ if(PCB STREQUAL X9E)
   set(LCD_DRIVER lcd_driver_spi.cpp)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS NO)
+  set(BLUETOOTH YES)
+  set(ROTARY_ENCODER YES)
 elseif(PCB STREQUAL X9D+)
   set(HAPTIC YES)
   set(LUA_EXPORT lua_export_x9d)
@@ -67,6 +69,9 @@ elseif(PCB STREQUAL X9D+)
     set(STATUS_LEDS YES)
     set(PXX2 ON)
     set(PXX_FREQUENCY "HIGH")
+    set(BLUETOOTH YES)
+    set(ROTARY_ENCODER YES)
+    set(INTERNAL_MODULE_SERIAL YES)
   else()
     option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON)
     option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF)
@@ -135,9 +140,12 @@ elseif(PCB STREQUAL X7)
       startup_stm32f40_41xxx.s
       )
     add_definitions(-DSTM32F40_41xxx)
+    add_definitions(-DHARDWARE_POWER_MANAGEMENT_UNIT)
     set(PXX2 ON)
     set(PXX_FREQUENCY "HIGH")
-    add_definitions(-DHARDWARE_POWER_MANAGEMENT_UNIT)
+    set(BLUETOOTH YES)
+    set(ROTARY_ENCODER YES)
+    set(INTERNAL_MODULE_SERIAL YES)
   else()
     option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON)
     option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF)
@@ -149,6 +157,9 @@ elseif(PCB STREQUAL X7)
     set(LUA_EXPORT lua_export_x7)
     add_definitions(-DRADIO_X7)
     add_definitions(-DEEPROM_VARIANT=0x4000)
+    set(BLUETOOTH YES)
+    add_definitions(-DBLUETOOTH_PROBE)
+    set(ROTARY_ENCODER YES)
   endif()
 elseif(PCB STREQUAL X9LITE)
   option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF)
@@ -173,6 +184,8 @@ elseif(PCB STREQUAL X9LITE)
   set(LCD_DRIVER lcd_driver_spi.cpp)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS YES)
+  set(ROTARY_ENCODER YES)
+  set(INTERNAL_MODULE_SERIAL YES)
 elseif(PCB STREQUAL X9LITES)
   option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF)
   option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON)
@@ -196,6 +209,9 @@ elseif(PCB STREQUAL X9LITES)
   set(LCD_DRIVER lcd_driver_spi.cpp)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS YES)
+  set(BLUETOOTH YES)
+  set(ROTARY_ENCODER YES)
+  set(INTERNAL_MODULE_SERIAL YES)
 elseif(PCB STREQUAL XLITE)
   option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON)
   option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF)
@@ -218,6 +234,8 @@ elseif(PCB STREQUAL XLITE)
   set(LCD_DRIVER lcd_driver_spi.cpp)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS YES)
+  set(BLUETOOTH YES)
+  set(INTERNAL_MODULE_SERIAL YES)
 elseif(PCB STREQUAL XLITES)
   option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF)
   option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON)
@@ -240,9 +258,12 @@ elseif(PCB STREQUAL XLITES)
   set(GVAR_SCREEN model_gvars.cpp)
   set(STATUS_LEDS YES)
   set(PXX2 ON)
+  set(BLUETOOTH YES)
+  set(GYRO YES)
+  set(INTERNAL_MODULE_SERIAL YES)
 endif()
 
-if(PCB STREQUAL XLITES)
+if(GYRO)
   add_definitions(-DGYRO)
   set(TARGET_SRC
     ${TARGET_SRC}
@@ -254,7 +275,7 @@ if(PCB STREQUAL XLITES)
     )
 endif()
 
-if(PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR PCB STREQUAL X9LITE OR PCB STREQUAL X9LITES OR (PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019) OR (PCB STREQUAL X7 AND PCBREV STREQUAL ACCESS))
+if(INTERNAL_MODULE_SERIAL)
   add_definitions(-DINTERNAL_MODULE_SERIAL)
   if(PXX_FREQUENCY STREQUAL HIGH)
     add_definitions(-DPXX_FREQUENCY_HIGH)
@@ -270,14 +291,14 @@ elseif(NOT (PCB STREQUAL X7 AND PCBREV STREQUAL T12))
     )
 endif()
 
-if(PCB STREQUAL X9E OR (PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019) OR (PCB STREQUAL X7 AND NOT (PCBREV STREQUAL T12)) OR PCB STREQUAL X9LITE OR PCB STREQUAL X9LITES)
+if(ROTARY_ENCODER)
   set(TARGET_SRC
     ${TARGET_SRC}
     ../common/arm/stm32/rotary_encoder_driver.cpp
     )
 endif()
 
-if(PCB STREQUAL X9E OR (PCB STREQUAL X7 AND NOT PCBREV STREQUAL T12) OR PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR (PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019) OR PCB STREQUAL X9LITES)
+if(BLUETOOTH)
   add_definitions(-DBLUETOOTH)
   set(TARGET_SRC
     ${TARGET_SRC}

radio/src/targets/taranis/board.h

@@ -800,7 +800,7 @@ void bluetoothDisable();
   #define IS_BLUETOOTH_CHIP_PRESENT()     (true)
 #elif defined(PCBX9LITE)
   #define IS_BLUETOOTH_CHIP_PRESENT()     (false)
-#elif (defined(PCBX7) || defined(PCBXLITE)) && !defined(SIMU)
+#elif defined(BLUETOOTH_PROBE) && !defined(SIMU)
   extern volatile uint8_t btChipPresent;
   #define IS_BLUETOOTH_CHIP_PRESENT()     (btChipPresent)
 #else