From 87b541b77fee6d4d7fded1933c55faaa518d4fad Mon Sep 17 00:00:00 2001 From: elecpower Date: Tue, 5 Apr 2022 17:07:29 +1000 Subject: [PATCH] Allow trainer modes OFF and Master-Multi for all radios --- companion/src/firmwares/modeldata.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp index c929da4db2d..f920a31ceeb 100644 --- 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; }