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

fix(cpn): use JSON lookup for CFS (#7579)

Browse Source 
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Peter Feerick
2026-07-22 09:46:24 +10:00
committed by GitHub
co-authored by Claude Sonnet 5
parent 50d12c7cea
commit 19708ce792
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/rawsource.cpp
+2 -2
View File
@@ -241,7 +241,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con
dfltName = Boards::getSwitchInfo(index - 1, board).name.c_str();
if (Boards::isSwitchFunc(index - 1, board)) {
if (model) {
int fsindex = Boards::getSwitchTagNum(index - 1, board) - 1;
int fsindex = Boards::getCFSIndexForSwitch(index - 1, board);
if (fsindex >= 0 && fsindex < CPN_MAX_SWITCHES_FUNCTION)
custName = QString(model->customSwitches[fsindex].name).trimmed();
}
@@ -375,7 +375,7 @@ bool RawSource::isAvailable(const ModelData * const model,
return false;
if (type == SOURCE_TYPE_SWITCH && b.isSwitchFunc(abs(index) - 1, board) &&
!model->isFunctionSwitchSourceAllowed(b.getSwitchTagNum(abs(index) - 1, board) - 1))
!model->isFunctionSwitchSourceAllowed(b.getCFSIndexForSwitch(abs(index) - 1, board)))
return false;
if (type == SOURCE_TYPE_VIRTUAL_INPUT && !model->isInputValid(abs(index) - 1))
companion/src/firmwares/rawswitch.cpp
+3 -2
View File
@@ -91,8 +91,9 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
swName = Boards::getSwitchInfo(qr.quot, board).name.c_str();
if (Boards::isSwitchFunc(qr.quot, board)) {
if (modelData) {
int fsindex = Boards::getSwitchTagNum(qr.quot, board) - 1;
custName = QString(modelData->customSwitches[fsindex].name).trimmed();
int fsindex = Boards::getCFSIndexForSwitch(qr.quot, board);
if (fsindex >= 0 && fsindex < CPN_MAX_SWITCHES_FUNCTION)
custName = QString(modelData->customSwitches[fsindex].name).trimmed();
}
}
else {