chore(bw): remove unused READ_ONLY and READ_ONLY_UNLOCKED macros (#5156)

This commit is contained in:
philmoz
2024-06-12 09:54:59 +10:00
committed by GitHub
parent 0c742e2863
commit 1bc114d99f
27 changed files with 156 additions and 202 deletions
+2 -4
View File
@@ -111,7 +111,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
#endif
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
(event == EVT_KEY_BREAK(KEY_ENTER))) {
s_editMode = 0;
newval = !val;
@@ -230,9 +230,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_BREAK(KEY_ENTER):
if (!menuTab || l_posVert>0) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = (s_editMode <= 0);
}
s_editMode = (s_editMode <= 0);
}
break;
+3 -3
View File
@@ -133,7 +133,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
newval = !val;
@@ -323,11 +323,11 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_BREAK(KEY_ENTER):
if (s_editMode > 1)
break;
if (menuHorizontalPosition < 0 && maxcol > 0 && READ_ONLY_UNLOCKED()) {
if (menuHorizontalPosition < 0 && maxcol > 0) {
l_posHorz = 0;
AUDIO_KEY_PRESS();
}
else if (READ_ONLY_UNLOCKED()) {
else {
s_editMode = (s_editMode<=0);
AUDIO_KEY_PRESS();
}
+3 -3
View File
@@ -133,7 +133,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
newval = !val;
@@ -383,11 +383,11 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_BREAK(KEY_ENTER):
if (s_editMode > 1)
break;
if (menuHorizontalPosition < 0 && maxcol > 0 && READ_ONLY_UNLOCKED()) {
if (menuHorizontalPosition < 0 && maxcol > 0) {
l_posHorz = 0;
AUDIO_KEY_PRESS();
}
else if (READ_ONLY_UNLOCKED()) {
else {
s_editMode = (s_editMode<=0);
AUDIO_KEY_PRESS();
}
@@ -123,7 +123,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
newval = !val;
@@ -318,9 +318,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_FIRST(KEY_ENTER):
if (!menuTab || l_posVert > 0) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = (s_editMode <= 0);
}
s_editMode = (s_editMode <= 0);
}
break;