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

fix: Show default names in Companion if switch/source names only spaces (#1524)

Browse Source
This commit is contained in:
Neil Horne
2022-01-30 19:06:21 +10:00
committed by GitHub
parent b865448752
commit 8158a8924d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/rawsource.cpp
+2 -2
View File
@@ -176,7 +176,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con
else if (isStick(&genAryIdx))
result = QString(generalSettings->stickName[genAryIdx]);
}
if (result.isEmpty())
if (result.trimmed().isEmpty())
result = Boards::getAnalogInputName(board, index);
return result;
@@ -191,7 +191,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con
case SOURCE_TYPE_SWITCH:
if (generalSettings)
result = QString(generalSettings->switchName[index]);
result = QString(generalSettings->switchName[index]).trimmed();
if (result.isEmpty())
result = Boards::getSwitchInfo(board, index).name;
return result;
companion/src/firmwares/rawswitch.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
if (IS_HORUS_OR_TARANIS(board)) {
qr = div(index-1, 3);
if (generalSettings)
swName = QString(generalSettings->switchName[qr.quot]);
swName = QString(generalSettings->switchName[qr.quot]).trimmed();
if (swName.isEmpty())
swName = Boards::getSwitchInfo(board, qr.quot).name;
return swName + directionIndicators.at(qr.rem > -1 && qr.rem < directionIndicators.size() ? qr.rem : 1);