From 9272029ec207eadd56e255ef1ddbfe67d3fc84e2 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 23 Oct 2020 22:03:51 +0200 Subject: [PATCH] Fix TX16S compilation when both BT and externalaccessmod are defined --- radio/src/gui/gui_common.cpp | 2 +- radio/src/targets/horus/hal.h | 5 ++++- radio/src/trainer.cpp | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 365880fef..5008f164b 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -791,7 +791,7 @@ bool isTrainerModeAvailable(int mode) } #endif -#if defined(RADIO_TX16S) +#if defined(RADIO_TX16S) && defined(TRAINER_BATTERY_COMPARTMENT) if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT) return (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER || g_eeGeneral.aux2SerialMode == UART_MODE_SBUS_TRAINER); #elif defined(PCBTARANIS) && !defined(TRAINER_BATTERY_COMPARTMENT) diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index e4d113488..479dd88c5 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -402,7 +402,7 @@ #endif // Serial Port (DEBUG) -#if (defined(PCBX12S) || defined(RADIO_TX16S)) && !defined(HARDWARE_EXTERNAL_ACCESS_MOD) +#if (defined(PCBX12S) || (defined(RADIO_TX16S)) && !defined(HARDWARE_EXTERNAL_ACCESS_MOD)) #define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) #define AUX_SERIAL_RCC_APB1Periph RCC_APB1Periph_USART3 #define AUX_SERIAL_RCC_APB2Periph 0 @@ -445,6 +445,9 @@ #define AUX2_SERIAL_DMA_Channel_RX DMA_Channel_5 #define AUX2_SERIAL_PWR_GPIO GPIOB #define AUX2_SERIAL_PWR_GPIO_PIN GPIO_Pin_0 // PB.00 +#if defined(RADIO_TX16S) + #define TRAINER_BATTERY_COMPARTMENT // allows serial port TTL trainer +#endif #elif defined(RADIO_TX16S) && defined(INTERNAL_GPS) #define GPS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOG) #define GPS_RCC_APB1Periph 0 diff --git a/radio/src/trainer.cpp b/radio/src/trainer.cpp index 94f624d3d..a5e99adde 100644 --- a/radio/src/trainer.cpp +++ b/radio/src/trainer.cpp @@ -89,7 +89,14 @@ void checkTrainerSettings() #if defined(TRAINER_BATTERY_COMPARTMENT) case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT: - auxSerialStop(); +#if defined(AUX_SERIAL) + if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) + auxSerialStop(); +#endif +#if defined(AUX2_SERIAL) + if (g_eeGeneral.aux2SerialMode == UART_MODE_SBUS_TRAINER) + aux2SerialStop(); +#endif break; #endif }