Allow trainer modes OFF and Master-Multi for all radios

EdgeTX · Apr 5, 2022 · 87b541b · 87b541b
1 parent 581cb25
commit 87b541b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp
@@ -1647,9 +1647,7 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
   bool ret = true;
   const Board::Type board = firmware->getBoard();
 
-  if (!IS_FLYSKY_NV14(board) && value == TRAINER_MODE_OFF)
-    ret = false;
-  else if (!IS_TARANIS(board) ||
+  if (!IS_TARANIS(board) ||
            IS_ACCESS_RADIO(board, Firmware::getCurrentVariant()->getId())) {
     if (value >= TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE &&
         value <= TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
@@ -1665,8 +1663,6 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
       value <= TRAINER_MODE_SLAVE_BLUETOOTH)
     ret = false;
 
-  if (!IS_RADIOMASTER_TX16S(board) && value == TRAINER_MODE_MULTI) ret = false;
-
   return ret;
 }