From d349479cd2290ffa9de71743e5e514ed2ec79c04 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 4 Oct 2020 18:34:54 +0200 Subject: [PATCH] Fix possible EM on TX16S --- radio/src/gui/gui_common.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index d832bc1c4..365880fef 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -390,6 +390,10 @@ bool isAux1ModeAvailable(int mode) #if defined(AUX2_SERIAL) if (mode == UART_MODE_SBUS_TRAINER) return g_eeGeneral.aux2SerialMode != UART_MODE_SBUS_TRAINER; +#if defined(RADIO_TX16S) + else + return (g_model.trainerData.mode != TRAINER_MODE_MASTER_BATTERY_COMPARTMENT || g_eeGeneral.aux2SerialMode == UART_MODE_SBUS_TRAINER); +#endif #endif return true; } @@ -399,6 +403,10 @@ bool isAux2ModeAvailable(int mode) #if defined(AUX_SERIAL) if (mode == UART_MODE_SBUS_TRAINER) return g_eeGeneral.auxSerialMode != UART_MODE_SBUS_TRAINER; +#if defined(RADIO_TX16S) + else + return (g_model.trainerData.mode != TRAINER_MODE_MASTER_BATTERY_COMPARTMENT || g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER); +#endif #endif return true; } @@ -783,7 +791,10 @@ bool isTrainerModeAvailable(int mode) } #endif -#if defined(PCBTARANIS) && !defined(TRAINER_BATTERY_COMPARTMENT) +#if defined(RADIO_TX16S) + 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) if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT) return false; #elif defined(PCBTARANIS)