Skip to content

Commit 5c00628

Browse files
philmozphilmoz
authored
chore(color): maintain 3.0 setting for key shortcuts and favorites (#6835)
1 parent 01d4ec6 commit 5c00628

15 files changed

+50
-35
lines changed

‎companion/src/firmwares/edgetx/yaml_generalsettings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
386386
node["modelCustomScriptsDisabled"] = (int)rhs.modelCustomScriptsDisabled;
387387
node["modelTelemetryDisabled"] = (int)rhs.modelTelemetryDisabled;
388388

389-
if (hasColorLcd && VERSION_MAJOR > 2) {
389+
if (hasColorLcd) {
390390
for (int i = 0; i < MAX_KEYSHORTCUTS; i += 1)
391391
if (rhs.keyShortcuts[i] != GeneralSettings::QM_NONE)
392392
node["keyShortcuts"][std::to_string(i)]["shortcut"] = QMPageLut << rhs.keyShortcuts[i];

‎companion/src/firmwares/generalsettings.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,9 +1092,9 @@ void GeneralSettings::setDefaultFavorites()
10921092
void GeneralSettings::setDefaultKeyShortcuts()
10931093
{
10941094
keyShortcuts[0] = QM_MODEL_SETUP; // MDL short
1095-
keyShortcuts[1] = (VERSION_MAJOR == 2) ? QM_TOOLS_APPS : QM_OPEN_QUICK_MENU; // SYS short
1095+
keyShortcuts[1] = QM_OPEN_QUICK_MENU; // SYS short
10961096
keyShortcuts[2] = QM_UI_SCREEN1; // TELE short
10971097
keyShortcuts[3] = QM_MANAGE_MODELS; // MDL long
1098-
keyShortcuts[4] = (VERSION_MAJOR == 2) ? QM_RADIO_SETUP : QM_TOOLS_APPS; // SYS long
1098+
keyShortcuts[4] = QM_TOOLS_APPS; // SYS long
10991099
keyShortcuts[5] = QM_TOOLS_CHAN_MON; // TELE long
11001100
}

‎radio/src/datastructs_private.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,13 +1162,8 @@ PACK(struct RadioData {
11621162
NOBACKUP(uint8_t pwrOffIfInactive);
11631163

11641164
#if defined(COLORLCD)
1165-
#if VERSION_MAJOR == 2
1166-
NOBACKUP(QuickMenuPage keyShortcuts[MAX_KEY_SHORTCUTS] SKIP);
1167-
NOBACKUP(QuickMenuPage qmFavorites[MAX_QM_FAVORITES] SKIP);
1168-
#else
11691165
NOBACKUP(QuickMenuPage keyShortcuts[MAX_KEY_SHORTCUTS]);
11701166
NOBACKUP(QuickMenuPage qmFavorites[MAX_QM_FAVORITES]);
1171-
#endif
11721167
#endif
11731168

11741169
NOBACKUP(uint8_t getBrightness() const

‎radio/src/datastructs_radio.cpp‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,30 @@ void RadioData::cfsSetOffColorLuaOverride(uint8_t n, bool v) {
9595
QMPage RadioData::getKeyShortcut(event_t event)
9696
{
9797
QMPage page = QM_NONE;
98+
#if VERSION_MAJOR == 2
99+
switch(event) {
100+
case EVT_KEY_BREAK(KEY_MODEL):
101+
page = QM_MODEL_SETUP;
102+
break;
103+
case EVT_KEY_BREAK(KEY_SYS):
104+
page = QM_TOOLS_APPS;
105+
break;
106+
case EVT_KEY_BREAK(KEY_TELE):
107+
page = QM_UI_SCREEN1;
108+
break;
109+
case EVT_KEY_LONG(KEY_MODEL):
110+
page = QM_MANAGE_MODELS;
111+
break;
112+
case EVT_KEY_LONG(KEY_SYS):
113+
page = QM_RADIO_SETUP;
114+
break;
115+
case EVT_KEY_LONG(KEY_TELE):
116+
page = QM_TOOLS_CHAN_MON;
117+
break;
118+
default:
119+
break;
120+
}
121+
#else
98122
switch(event) {
99123
case EVT_KEY_BREAK(KEY_MODEL):
100124
page = (QMPage)keyShortcuts[0].shortcut;
@@ -117,6 +141,7 @@ QMPage RadioData::getKeyShortcut(event_t event)
117141
default:
118142
break;
119143
}
144+
#endif
120145
if (page >= QM_UI_SCREEN1 && page <= QM_UI_SCREEN10)
121146
page = (QMPage)(QM_UI_SCREEN1 + ViewMain::instance()->getCurrentMainView());
122147
return page;
@@ -160,13 +185,8 @@ void RadioData::defaultKeyShortcuts()
160185
{
161186
setKeyShortcut(EVT_KEY_BREAK(KEY_MODEL), QM_MODEL_SETUP);
162187
setKeyShortcut(EVT_KEY_LONG(KEY_MODEL), QM_MANAGE_MODELS);
163-
#if VERSION_MAJOR == 2
164-
setKeyShortcut(EVT_KEY_BREAK(KEY_SYS), QM_TOOLS_APPS);
165-
setKeyShortcut(EVT_KEY_LONG(KEY_SYS), QM_RADIO_SETUP);
166-
#else
167188
setKeyShortcut(EVT_KEY_BREAK(KEY_SYS), QM_OPEN_QUICK_MENU);
168189
setKeyShortcut(EVT_KEY_LONG(KEY_SYS), QM_TOOLS_APPS);
169-
#endif
170190
setKeyShortcut(EVT_KEY_BREAK(KEY_TELE), QM_UI_SCREEN1);
171191
setKeyShortcut(EVT_KEY_LONG(KEY_TELE), QM_TOOLS_CHAN_MON);
172192
}

‎radio/src/storage/yaml/yaml_datastructs_f16.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@ static const struct YamlNode struct_RadioData[] = {
447447
YAML_UNSIGNED( "modelQuickSelect", 1 ),
448448
YAML_PADDING( 5 ),
449449
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
450-
YAML_PADDING( 48 ),
451-
YAML_PADDING( 96 ),
450+
YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
451+
YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
452452
YAML_END
453453
};
454454
static const struct YamlNode struct_unsigned_8[] = {

‎radio/src/storage/yaml/yaml_datastructs_nb4p.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ static const struct YamlNode struct_RadioData[] = {
438438
YAML_UNSIGNED( "modelQuickSelect", 1 ),
439439
YAML_PADDING( 5 ),
440440
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
441-
YAML_PADDING( 48 ),
442-
YAML_PADDING( 96 ),
441+
YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
442+
YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
443443
YAML_END
444444
};
445445
static const struct YamlNode struct_unsigned_8[] = {

‎radio/src/storage/yaml/yaml_datastructs_nv14.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ static const struct YamlNode struct_RadioData[] = {
445445
YAML_UNSIGNED( "modelQuickSelect", 1 ),
446446
YAML_PADDING( 5 ),
447447
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
448-
YAML_PADDING( 48 ),
449-
YAML_PADDING( 96 ),
448+
YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
449+
YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
450450
YAML_END
451451
};
452452
static const struct YamlNode struct_unsigned_8[] = {

‎radio/src/storage/yaml/yaml_datastructs_pa01.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = {
470470
YAML_UNSIGNED( "modelQuickSelect", 1 ),
471471
YAML_PADDING( 5 ),
472472
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
473-
YAML_PADDING( 48 ),
474-
YAML_PADDING( 96 ),
473+
YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
474+
YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
475475
YAML_END
476476
};
477477
static const struct YamlNode struct_unsigned_8[] = {

‎radio/src/storage/yaml/yaml_datastructs_pl18.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ static const struct YamlNode struct_RadioData[] = {
445445
YAML_UNSIGNED( "modelQuickSelect", 1 ),
446446
YAML_PADDING( 5 ),
447447
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
448-
YAML_PADDING( 48 ),
449-
YAML_PADDING( 96 ),
448+
YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
449+
YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
450450
YAML_END
451451
};
452452
static const struct YamlNode struct_unsigned_8[] = {

‎radio/src/storage/yaml/yaml_datastructs_pl18u.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ static const struct YamlNode struct_RadioData[] = {
438438
YAML_UNSIGNED( "modelQuickSelect", 1 ),
439439
YAML_PADDING( 5 ),
440440
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
441-
YAML_PADDING( 48 ),
442-
YAML_PADDING( 96 ),
441+
YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
442+
YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
443443
YAML_END
444444
};
445445
static const struct YamlNode struct_unsigned_8[] = {

0 commit comments

Comments
 (0)