refactor: key handling (#4849)

This commit is contained in:
philmoz
2024-05-27 18:33:53 +10:00
committed by GitHub
parent b8a0038c68
commit e807ccbebf
101 changed files with 380 additions and 578 deletions
+1 -1
View File
@@ -228,7 +228,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
s_editMode = EDIT_MODE_INIT;
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
if (!menuTab || l_posVert>0) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = (s_editMode <= 0);
+2 -13
View File
@@ -141,7 +141,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
if (i_flags & INCDEC_SOURCE) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = MIXSRC_NONE;
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
@@ -194,7 +193,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
else if (i_flags & INCDEC_SWITCH) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = SWSRC_NONE;
if (i_min <= SWSRC_FIRST_SWITCH && i_max >= SWSRC_LAST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= SWSRC_FIRST_TRIM && i_max >= SWSRC_LAST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
@@ -286,23 +284,14 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
if (menuTab) {
int cc = curr;
switch (event) {
#if defined(KEYS_GPIO_REG_PAGEUP)
case EVT_KEY_FIRST(KEY_PAGEUP):
#else
case EVT_KEY_LONG(KEY_PAGE):
#endif
case EVT_KEY_BREAK(KEY_PAGEUP):
if (s_editMode>0)
break;
cc = chgMenu(curr, menuTab, menuTabSize, -1);
killEvents(event);
break;
#if defined(KEYS_GPIO_REG_PAGEDN)
case EVT_KEY_FIRST(KEY_PAGEDN):
#else
case EVT_KEY_BREAK(KEY_PAGE):
#endif
case EVT_KEY_BREAK(KEY_PAGEDN):
if (s_editMode>0)
break;
+2 -6
View File
@@ -141,7 +141,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
if (i_flags & INCDEC_SOURCE) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = MIXSRC_NONE;
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
@@ -194,7 +193,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
else if (i_flags & INCDEC_SWITCH) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
checkIncDecSelection = SWSRC_NONE;
if (i_min <= SWSRC_FIRST_SWITCH && i_max >= SWSRC_LAST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= SWSRC_FIRST_TRIM && i_max >= SWSRC_LAST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
@@ -329,7 +327,6 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
switch (event) {
case EVT_KEY_LONG(KEY_MENU):
if (menuTab == menuTabModel) {
killEvents(event);
if (modelHasNotes()) {
POPUP_MENU_ADD_SD_ITEM(STR_VIEW_CHANNELS);
POPUP_MENU_ADD_ITEM(STR_VIEW_NOTES);
@@ -341,15 +338,14 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
}
break;
case EVT_KEY_LONG(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEUP):
if (s_editMode>0)
break;
cc = chgMenu(curr, menuTab, menuTabSize, -1);
killEvents(event);
break;
case EVT_KEY_BREAK(KEY_PAGE):
case EVT_KEY_BREAK(KEY_PAGEDN):
if (s_editMode>0)
break;
@@ -150,7 +150,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
if (i_flags & INCDEC_SOURCE) {
if (event == EVT_KEY_LONG(KEY_ENTER) && !keysGetState(KEY_SHIFT)) {
killEvents(event);
checkIncDecSelection = MIXSRC_NONE;
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
@@ -203,7 +202,6 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
else if (i_flags & INCDEC_SWITCH) {
if (event == EVT_KEY_LONG(KEY_ENTER) && !keysGetState(KEY_SHIFT)) {
killEvents(event);
checkIncDecSelection = SWSRC_NONE;
if (i_min <= SWSRC_FIRST_SWITCH && i_max >= SWSRC_LAST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= SWSRC_FIRST_TRIM && i_max >= SWSRC_LAST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);