piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BT defined on T15 (#5445)

Browse Source
This commit is contained in:
3djc
2024-08-17 22:10:31 +10:00
committed by GitHub
parent f40ff60b55
commit 2cf8878004
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/CMakeLists.txt
+6 -1
View File
@@ -69,7 +69,12 @@ if (PCB STREQUAL X10)
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
option(BLUETOOTH "Support for bluetooth module" OFF)
option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
set(AUX_SERIAL ON)
if (BLUETOOTH)
set(AUX_SERIAL OFF)
else()
set(AUX_SERIAL ON)
endif()
# Aux2 is reserved for serial gimbal on this radio
set(AUX2_SERIAL OFF)
add_definitions(-DMANUFACTURER_JUMPER)
set(LCD_DRIVER lcd_st7796s_driver.cpp)
radio/src/targets/horus/hal.h
+17 -9
View File
@@ -1051,14 +1051,22 @@
// Bluetooth
#define STORAGE_BLUETOOTH
#if defined(BLUETOOTH)
#define BT_USART USART6
#define BT_USART_IRQn USART6_IRQn
#define BT_USART_GPIO GPIOG
#define BT_TX_GPIO GPIO_PIN(GPIOG, 14) // PG.14
#define BT_RX_GPIO GPIO_PIN(GPIOG, 9) // PG.09
#if defined(RADIO_TX16S)
#define BT_PWR_GPIO GPIO_PIN(GPIOB, 0) // PB.00
#endif
#if defined(RADIO_T15)
#define BT_USART USART3
#define BT_USART_IRQn USART3_IRQn
#define BT_USART_GPIO GPIOB
#define BT_TX_GPIO GPIO_PIN(GPIOB, 10) // PB.10
#define BT_RX_GPIO GPIO_PIN(GPIOB, 11) // PB.11
#else
#define BT_USART USART6
#define BT_USART_IRQn USART6_IRQn
#define BT_USART_GPIO GPIOG
#define BT_TX_GPIO GPIO_PIN(GPIOG, 14) // PG.14
#define BT_RX_GPIO GPIO_PIN(GPIOG, 9) // PG.09
#if defined(RADIO_TX16S)
#define BT_PWR_GPIO GPIO_PIN(GPIOB, 0) // PB.00
#endif
#endif
#endif
#if defined(PCBX12S)
@@ -1071,7 +1079,7 @@
// #define BT_BRTS_GPIO_PIN GPIO_Pin_10 // PG.10
// #define BT_BCTS_GPIO GPIOG
// #define BT_BCTS_GPIO_PIN GPIO_Pin_11 // PG.11
#elif defined(PCBX10)
#elif defined(PCBX10) && !defined(RADIO_T15)
#define BT_EN_GPIO GPIO_PIN(GPIOG, 10) // PG.10
#endif