fix(cpn): set input and switch types to none if not configured (#5026)

This commit is contained in:
Neil Horne
2024-05-24 18:07:14 +10:00
committed by GitHub
parent d21ac7be2c
commit fae3f8384b
3 changed files with 44 additions and 31 deletions
+7 -8
View File
@@ -156,6 +156,7 @@ bool GeneralSettings::unassignedInputFlexSwitches() const
void GeneralSettings::clear()
{
memset(reinterpret_cast<void *>(this), 0, sizeof(GeneralSettings));
setDefaultControlTypes(getCurrentBoard());
init();
}
@@ -191,8 +192,6 @@ void GeneralSettings::init()
vBatMax = -40; //8V
}
setDefaultControlTypes(board);
backlightMode = 3; // keys and sticks
backlightDelay = 2; // 2 * 5 = 10 secs
inactivityTimer = 10;
@@ -223,12 +222,6 @@ void GeneralSettings::init()
else if (IS_TARANIS_X9E(board) || IS_TARANIS_SMALL(board))
strcpy(bluetoothName, "taranis");
for (uint8_t i = 0; i < 4; i++) {
trainer.mix[i].mode = TrainerMix::TRN_MIX_MODE_SUBST;
trainer.mix[i].src = i;
trainer.mix[i].weight = 100;
}
ttsLanguage[0] = 'e';
ttsLanguage[1] = 'n';
@@ -369,6 +362,12 @@ void GeneralSettings::setDefaultControlTypes(Board::Type board)
switchConfig[i].inverted = info.inverted;
switchConfig[i].inputIdx = SWITCH_INPUTINDEX_NONE;
}
for (uint8_t i = 0; i < 4; i++) {
trainer.mix[i].mode = TrainerMix::TRN_MIX_MODE_SUBST;
trainer.mix[i].src = i;
trainer.mix[i].weight = 100;
}
}
int GeneralSettings::getDefaultStick(unsigned int channel) const