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

chore(color): support for reverting UI for 2.12 (#6823)

Browse Source 
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
Peter Feerick
2025-11-25 13:17:06 +10:00
committed by GitHub
co-authored by philmoz
parent ef32172454
commit 2932822e37
43 changed files with 537 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
node["modelCustomScriptsDisabled"] = (int)rhs.modelCustomScriptsDisabled;
node["modelTelemetryDisabled"] = (int)rhs.modelTelemetryDisabled;
if (hasColorLcd) {
if (hasColorLcd && VERSION_MAJOR > 2) {
for (int i = 0; i < MAX_KEYSHORTCUTS; i += 1)
if (rhs.keyShortcuts[i] != GeneralSettings::QM_NONE)
node["keyShortcuts"][std::to_string(i)]["shortcut"] = QMPageLut << rhs.keyShortcuts[i];
companion/src/firmwares/generalsettings.cpp
+2 -2
View File
@@ -1092,9 +1092,9 @@ void GeneralSettings::setDefaultFavorites()
void GeneralSettings::setDefaultKeyShortcuts()
{
keyShortcuts[0] = QM_MODEL_SETUP; // MDL short
keyShortcuts[1] = QM_OPEN_QUICK_MENU; // SYS short
keyShortcuts[1] = (VERSION_MAJOR == 2) ? QM_TOOLS_APPS : QM_OPEN_QUICK_MENU; // SYS short
keyShortcuts[2] = QM_UI_SCREEN1; // TELE short
keyShortcuts[3] = QM_MANAGE_MODELS; // MDL long
keyShortcuts[4] = QM_TOOLS_APPS; // SYS long
keyShortcuts[4] = (VERSION_MAJOR == 2) ? QM_RADIO_SETUP : QM_TOOLS_APPS; // SYS long
keyShortcuts[5] = QM_TOOLS_CHAN_MON; // TELE long
}
companion/src/firmwares/opentx/opentxinterface.cpp
+2 -2
View File
@@ -358,9 +358,9 @@ int OpenTxFirmware::getCapability(::Capability capability)
return 46;
}
case QMFavourites:
return Boards::getCapability(board, Board::HasColorLcd) ? MAX_QMFAVOURITES : 0;
return VERSION_MAJOR > 2 && Boards::getCapability(board, Board::HasColorLcd) ? MAX_QMFAVOURITES : 0;
case KeyShortcuts:
return Boards::getCapability(board, Board::HasColorLcd) ? MAX_KEYSHORTCUTS : 0;
return VERSION_MAJOR > 2 && Boards::getCapability(board, Board::HasColorLcd) ? MAX_KEYSHORTCUTS : 0;
default:
return 0;
}
companion/src/generaledit/generalkeyshortcuts.cpp
-1
View File
@@ -85,7 +85,6 @@ GeneralKeysPanel::GeneralKeysPanel(QWidget * parent, GeneralSettings & generalSe
GeneralKeysPanel::~GeneralKeysPanel()
{
}
void GeneralKeysPanel::addLabel(QString text)