piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cpn): more fixes to RawSource calls (#5155)

Browse Source 
Arising from index shift in #4722
This commit is contained in:
philmoz
2024-06-12 09:12:04 +10:00
committed by GitHub
parent 993f2713d4
commit 0c742e2863
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/joystickdialog.cpp
+3 -3
View File
@@ -162,7 +162,7 @@ void joystickDialog::populateSourceCombo(QComboBox * cb)
if (radioSettings.isInputStick(i))
wname = Boards::getAxisName(i);
else
wname = RawSource(RawSourceType::SOURCE_TYPE_INPUT, i).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_INPUT, i + 1).toString(nullptr, &radioSettings);
cb->addItem(wname, i);
}
}
@@ -186,7 +186,7 @@ void joystickDialog::populateButtonCombo(QComboBox * cb)
for (i = 0; i < ttlSwitches; ++i) {
if (radioSettings.switchConfig[i].type != Board::SWITCH_NOT_AVAILABLE) {
swtype = Board::SwitchType(radioSettings.switchConfig[i].type);
wname = RawSource(RawSourceType::SOURCE_TYPE_SWITCH, i).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_SWITCH, i + 1).toString(nullptr, &radioSettings);
if (swtype == Board::SWITCH_3POS) {
cb->addItem(wname + CPN_STR_SW_INDICATOR_UP, i | JS_BUTTON_3POS_UP);
cb->addItem(wname + CPN_STR_SW_INDICATOR_DN, i | JS_BUTTON_3POS_DN);
@@ -197,7 +197,7 @@ void joystickDialog::populateButtonCombo(QComboBox * cb)
}
for (i = 0; i < ttlTrims; i += 1) {
wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, i).toString(nullptr, &radioSettings);
wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, i + 1).toString(nullptr, &radioSettings);
if ((i == 0) || (i == 3)) {
cb->addItem(wname + " Left", (i + ttlSwitches) | JS_BUTTON_3POS_DN);
cb->addItem(wname + " Right", (i + ttlSwitches) | JS_BUTTON_3POS_UP);