fix: Companion trainer modes OFF and Master-Multi available for all radios (#1806)

* Allow trainer modes OFF and Master-Multi for all radios

* Change Trainer mode Off to the standard OFF

* fix: German for Trainer OFF, Master and Slave
This commit is contained in:
Neil Horne
2022-04-05 20:16:19 +10:00
committed by GitHub
parent b6dd2fe6bd
commit c8e9ca0a32
12 changed files with 48 additions and 52 deletions
+1 -5
View File
@@ -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;
}