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

chore(color): maintain 3.0 setting for key shortcuts and favorites (#6835)

Browse Source
This commit is contained in:
philmoz
2025-12-05 05:05:58 +00:00
committed by Peter Feerick
parent d2333beaa6
commit 7147cb0a57
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs_radio.cpp
+25 -5
View File
@@ -95,6 +95,30 @@ void RadioData::cfsSetOffColorLuaOverride(uint8_t n, bool v) {
QMPage RadioData::getKeyShortcut(event_t event)
{
QMPage page = QM_NONE;
#if VERSION_MAJOR == 2
switch(event) {
case EVT_KEY_BREAK(KEY_MODEL):
page = QM_MODEL_SETUP;
break;
case EVT_KEY_BREAK(KEY_SYS):
page = QM_TOOLS_APPS;
break;
case EVT_KEY_BREAK(KEY_TELE):
page = QM_UI_SCREEN1;
break;
case EVT_KEY_LONG(KEY_MODEL):
page = QM_MANAGE_MODELS;
break;
case EVT_KEY_LONG(KEY_SYS):
page = QM_RADIO_SETUP;
break;
case EVT_KEY_LONG(KEY_TELE):
page = QM_TOOLS_CHAN_MON;
break;
default:
break;
}
#else
switch(event) {
case EVT_KEY_BREAK(KEY_MODEL):
page = (QMPage)keyShortcuts[0].shortcut;
@@ -117,6 +141,7 @@ QMPage RadioData::getKeyShortcut(event_t event)
default:
break;
}
#endif
if (page >= QM_UI_SCREEN1 && page <= QM_UI_SCREEN10)
page = (QMPage)(QM_UI_SCREEN1 + ViewMain::instance()->getCurrentMainView());
return page;
@@ -160,13 +185,8 @@ void RadioData::defaultKeyShortcuts()
{
setKeyShortcut(EVT_KEY_BREAK(KEY_MODEL), QM_MODEL_SETUP);
setKeyShortcut(EVT_KEY_LONG(KEY_MODEL), QM_MANAGE_MODELS);
#if VERSION_MAJOR == 2
setKeyShortcut(EVT_KEY_BREAK(KEY_SYS), QM_TOOLS_APPS);
setKeyShortcut(EVT_KEY_LONG(KEY_SYS), QM_RADIO_SETUP);
#else
setKeyShortcut(EVT_KEY_BREAK(KEY_SYS), QM_OPEN_QUICK_MENU);
setKeyShortcut(EVT_KEY_LONG(KEY_SYS), QM_TOOLS_APPS);
#endif
setKeyShortcut(EVT_KEY_BREAK(KEY_TELE), QM_UI_SCREEN1);
setKeyShortcut(EVT_KEY_LONG(KEY_TELE), QM_TOOLS_CHAN_MON);
}