Fix TX16S compilation when both BT and externalaccessmod are defined

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)

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

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
     }