From a95df473843069ff28d4a3dbcaf35ba36ceed566 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 14 Dec 2020 19:41:14 +0100
Subject: [PATCH] Fixes #8159 Still not tested, but it doesn't reboot anymore

---
 radio/src/targets/common/arm/stm32/aux_serial_driver.cpp | 2 +-
 radio/src/trainer.cpp                                    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp b/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
index d88c32610..5c8f1e97f 100644
--- a/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
@@ -128,7 +128,7 @@ void auxSerialInit(unsigned int mode, unsigned int protocol)
       break;
 
     case UART_MODE_SBUS_TRAINER:
-      auxSerialSetup(SBUS_BAUDRATE, false, USART_WordLength_9b, USART_Parity_Even, USART_StopBits_2); // 2 stop bits requires USART_WordLength_9b
+      auxSerialSetup(SBUS_BAUDRATE, true, USART_WordLength_9b, USART_Parity_Even, USART_StopBits_2); // 2 stop bits requires USART_WordLength_9b
       AUX_SERIAL_POWER_ON();
       break;
 
diff --git a/radio/src/trainer.cpp b/radio/src/trainer.cpp
index 6c6bc7b79..893d42b67 100644
--- a/radio/src/trainer.cpp
+++ b/radio/src/trainer.cpp
@@ -140,15 +140,19 @@ void checkTrainerSettings()
         if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER)
           auxSerialSbusInit();
         else
+          init_trainer_capture();
+        break;
 #endif
 #if defined(AUX2_SERIAL)
         if (g_eeGeneral.aux2SerialMode == UART_MODE_SBUS_TRAINER)
           aux2SerialSbusInit();
         else
-#endif
           init_trainer_capture();
         break;
 #endif
+        init_trainer_capture();
+        break;
+#endif
 
       case TRAINER_MODE_MASTER_TRAINER_JACK:
         init_trainer_capture();