Update pin definitions for bluetooth and the GX12

modified: radio/src/targets/taranis/CMakeLists.txt modified: radio/src/targets/taranis/hal.h
EdgeTX · Feb 7, 2025 · 842ab73 · 842ab73
1 parent db59ee5
commit 842ab73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
@@ -317,7 +317,9 @@ elseif(PCB STREQUAL X7)
     set(PXX2 ON)
     set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
     set(FLYSKY_GIMBAL YES)
-    set(AUX_SERIAL ON)
+    if (NOT BLUETOOTH)
+      set(AUX_SERIAL ON)
+    endif()
     set(AUX2_SERIAL OFF)
     set(RGBLEDS YES)
     set(FUNCTION_SWITCHES_WITH_RGB YES)

diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h
@@ -2835,14 +2835,19 @@
   #else
     #define BT_EN_GPIO                  GPIO_PIN(GPIOE, 12) // PE.12
   #endif
-  #define BT_TX_GPIO                    GPIO_PIN(GPIOB, 10) // PB.10
-  #define BT_RX_GPIO                    GPIO_PIN(GPIOB, 11) // PB.11
+  #if defined(RADIO_GX12)
+    #define BT_TX_GPIO                    GPIO_PIN(GPIOD, 8) // PD.08
+    #define BT_RX_GPIO                    GPIO_PIN(GPIOD, 9) // PD.09
+  #else
+    #define BT_TX_GPIO                    GPIO_PIN(GPIOB, 10) // PB.10
+    #define BT_RX_GPIO                    GPIO_PIN(GPIOB, 11) // PB.11
+  #endif
   #define BT_USART                      USART3
   #define BT_USART_IRQn                 USART3_IRQn
   // #define BT_DMA_Stream_RX              DMA1_Stream1
   // #define BT_DMA_Channel_RX             DMA_Channel_4
 #else
-  #if defined(PCBX9D) || defined(PCBX9DP) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_TX12MK2)|| defined(RADIO_BOXER) || defined(RADIO_T8) || defined(RADIO_COMMANDO8) || defined(RADIO_ZORRO)
+  #if defined(PCBX9D) || defined(PCBX9DP) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_TX12MK2)|| defined(RADIO_BOXER) || defined(RADIO_GX12) || defined(RADIO_T8) || defined(RADIO_COMMANDO8) || defined(RADIO_ZORRO)
     // To avoid change in modelsize, todo: remove me
     #define STORAGE_BLUETOOTH
   #endif