diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index f4f4091164e..62fa7dc69d7 100644 --- 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 index 9aafcfe3d23..ce1e58d8d91 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -2829,20 +2829,25 @@ #elif defined(PCBX9LITES) #define BT_EN_GPIO GPIO_PIN(GPIOD, 14) // PD.14 #elif defined(MANUFACTURER_RADIOMASTER) - #if defined(RADIO_POCKET) + #if defined(RADIO_POCKET) || defined(RADIO_GX12) #define BT_EN_GPIO GPIO_PIN(GPIOA, 6) // PA.06 #endif #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