fix(cpn): some trainer options not working (#5684)
This commit is contained in:
@@ -1651,6 +1651,16 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
|
||||
generalSettings.bluetoothMode)
|
||||
return false;
|
||||
|
||||
if (value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE &&
|
||||
!Boards::getCapability(board, Board::HasTrainerModuleSBUS))
|
||||
return false;
|
||||
|
||||
if ((value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || value == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE) &&
|
||||
(Boards::getCapability(board, Board::HasTrainerModuleCPPM) ||
|
||||
Boards::getCapability(board, Board::HasTrainerModuleSBUS)) &&
|
||||
moduleData[1].protocol != PULSES_OFF)
|
||||
return false;
|
||||
|
||||
if (value == TRAINER_MODE_MASTER_SERIAL &&
|
||||
(generalSettings.serialPort[GeneralSettings::SP_AUX1] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER &&
|
||||
generalSettings.serialPort[GeneralSettings::SP_AUX2] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER))
|
||||
@@ -1669,16 +1679,6 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
|
||||
!Boards::getCapability(board, Board::HasTrainerModuleCPPM))
|
||||
return false;
|
||||
|
||||
if (value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE &&
|
||||
!Boards::getCapability(board, Board::HasTrainerModuleSBUS))
|
||||
return false;
|
||||
|
||||
if ((value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || value == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE) &&
|
||||
(Boards::getCapability(board, Board::HasTrainerModuleCPPM) ||
|
||||
Boards::getCapability(board, Board::HasTrainerModuleSBUS)) &&
|
||||
moduleData[1].protocol != PULSES_OFF)
|
||||
return false;
|
||||
|
||||
if (value == TRAINER_MODE_MULTI &&
|
||||
((!Boards::getCapability(board, Board::HasInternalModuleSupport) &&
|
||||
!Boards::getCapability(board, Board::HasExternalModuleSupport)) ||
|
||||
|
||||
Reference in New Issue
Block a user