Merge with latest 2.3

2019-11-07 15:04:45 +01:00
parent 579aa03cd1 50a07dc8d8
commit 071116afeb
286 changed files with 9956 additions and 10363 deletions
@@ -115,15 +115,14 @@ void checkTrainerSettings()

 #if defined(TRAINER_BATTERY_COMPARTMENT)
      case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
-        if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) {
+        if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER)
          auxSerialSbusInit();
-          break;
-        }
-        // no break
+        else
+          init_trainer_capture();
+        break;
 #endif

-      default:
-        // master is default
+      case TRAINER_MODE_MASTER_TRAINER_JACK:
        init_trainer_capture();
        break;
    }