Skip to content

Commit 08c4619

Browse files
author
philmoz
committed
Remove more killEvents() calls and change FIRST to BREAK.
1 parent 9344684 commit 08c4619

10 files changed

+32
-62
lines changed

‎radio/src/gui/128x64/model_curve_edit.cpp

+8-15
Original file line numberDiff line numberDiff line change
@@ -157,24 +157,17 @@ void menuModelCurveOne(event_t event)
157157
}
158158
break;
159159

160-
#if defined(KEYS_GPIO_REG_MDL)
161-
case EVT_KEY_FIRST(KEY_MODEL):
162-
pushMenu(menuChannelsView);
160+
#if defined(NAVIGATION_XLITE)
161+
case EVT_KEY_FIRST(KEY_ENTER):
162+
if (!keysGetState(KEY_SHIFT))
163+
break;
163164
killEvents(event);
164-
break;
165-
#elif defined(NAVIGATION_X7)
166-
case EVT_KEY_FIRST(KEY_MENU):
165+
#else
166+
case EVT_KEY_BREAK(KEY_MODEL):
167+
case EVT_KEY_BREAK(KEY_MENU):
168+
#endif
167169
pushMenu(menuChannelsView);
168-
killEvents(event);
169170
break;
170-
#elif defined(NAVIGATION_XLITE)
171-
case EVT_KEY_FIRST(KEY_ENTER):
172-
if (keysGetState(KEY_SHIFT)) {
173-
pushMenu(menuChannelsView);
174-
killEvents(event);
175-
}
176-
break;
177-
#endif
178171
}
179172

180173
drawCurve();

‎radio/src/gui/128x64/model_input_edit.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,14 @@ uint8_t FM_ROW(uint8_t value)
5757

5858
void menuModelExpoOne(event_t event)
5959
{
60-
#if defined(KEYS_GPIO_REG_MDL)
61-
if (event == EVT_KEY_FIRST(KEY_MODEL)) {
62-
pushMenu(menuChannelsView);
63-
killEvents(event);
64-
}
65-
#elif defined(NAVIGATION_X7)
66-
if (event == EVT_KEY_FIRST(KEY_MENU)) {
60+
#if defined(NAVIGATION_XLITE)
61+
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
6762
pushMenu(menuChannelsView);
6863
killEvents(event);
6964
}
70-
#elif defined(NAVIGATION_XLITE)
71-
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
65+
#else
66+
if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
7267
pushMenu(menuChannelsView);
73-
killEvents(event);
7468
}
7569
#endif
7670
ExpoData * ed = expoAddress(s_currIdx);

‎radio/src/gui/128x64/model_mix_edit.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,14 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
9090

9191
void menuModelMixOne(event_t event)
9292
{
93-
#if defined(KEYS_GPIO_REG_MDL)
94-
if (event == EVT_KEY_FIRST(KEY_MODEL)) {
95-
pushMenu(menuChannelsView);
96-
killEvents(event);
97-
}
98-
#elif defined(NAVIGATION_X7)
99-
if (event == EVT_KEY_FIRST(KEY_MENU)) {
93+
#if defined(NAVIGATION_XLITE)
94+
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
10095
pushMenu(menuChannelsView);
10196
killEvents(event);
10297
}
103-
#elif defined(NAVIGATION_XLITE)
104-
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
98+
#else
99+
if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
105100
pushMenu(menuChannelsView);
106-
killEvents(event);
107101
}
108102
#endif
109103
MixData * md2 = mixAddress(s_currIdx) ;

‎radio/src/gui/128x64/model_setup.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1767,10 +1767,10 @@ void menuModelSetup(event_t event)
17671767
if (isModuleR9MNonAccess(moduleIdx) || isModuleD16(moduleIdx) || isModuleAFHDS3(moduleIdx)) {
17681768
#if defined(PCBXLITE)
17691769
if (EVT_KEY_MASK(event) == KEY_ENTER) {
1770+
killEvents(event);
17701771
#else
17711772
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
17721773
#endif
1773-
killEvents(event);
17741774
#if defined(AFHDS3)
17751775
if (isModuleAFHDS3(moduleIdx)) {
17761776
startBindMenuAfhds3(moduleIdx);

‎radio/src/gui/212x64/view_statistics.cpp

+8-12
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@ void menuStatisticsView(event_t event)
3333
title(STR_MENUSTAT);
3434

3535
switch(event) {
36-
case EVT_KEY_FIRST(KEY_PLUS):
36+
case EVT_KEY_BREAK(KEY_PLUS):
3737
case EVT_KEY_BREAK(KEY_PAGEDN):
3838
chainMenu(menuStatisticsDebug);
3939
break;
4040

41-
case EVT_KEY_FIRST(KEY_MINUS):
41+
case EVT_KEY_BREAK(KEY_MINUS):
4242
case EVT_KEY_BREAK(KEY_PAGEUP):
43-
killEvents(event);
4443
#if defined(DEBUG_TRACE_BUFFER)
4544
chainMenu(menuTraceBuffer);
4645
#else
@@ -133,15 +132,14 @@ void menuStatisticsDebug(event_t event)
133132
maxMixerDuration = 0;
134133
break;
135134

136-
case EVT_KEY_FIRST(KEY_PLUS):
135+
case EVT_KEY_BREAK(KEY_PLUS):
137136
case EVT_KEY_BREAK(KEY_PAGEDN):
138137
disableVBatBridge();
139138
chainMenu(menuStatisticsDebug2);
140139
break;
141140

142-
case EVT_KEY_FIRST(KEY_MINUS):
141+
case EVT_KEY_BREAK(KEY_MINUS):
143142
case EVT_KEY_BREAK(KEY_PAGEUP):
144-
killEvents(event);
145143
disableVBatBridge();
146144
chainMenu(menuStatisticsView);
147145
break;
@@ -214,7 +212,7 @@ void menuStatisticsDebug2(event_t event)
214212
title(STR_MENUDEBUG);
215213

216214
switch(event) {
217-
case EVT_KEY_FIRST(KEY_PLUS):
215+
case EVT_KEY_BREAK(KEY_PLUS):
218216
case EVT_KEY_BREAK(KEY_PAGEDN):
219217
#if defined(DEBUG_TRACE_BUFFER)
220218
chainMenu(menuTraceBuffer);
@@ -223,9 +221,8 @@ void menuStatisticsDebug2(event_t event)
223221
#endif
224222
return;
225223

226-
case EVT_KEY_FIRST(KEY_MINUS):
224+
case EVT_KEY_BREAK(KEY_MINUS):
227225
case EVT_KEY_BREAK(KEY_PAGEUP):
228-
killEvents(event);
229226
chainMenu(menuStatisticsDebug);
230227
break;
231228

@@ -256,13 +253,12 @@ void menuTraceBuffer(event_t event)
256253
dumpTraceBuffer();
257254
break;
258255

259-
case EVT_KEY_FIRST(KEY_MINUS):
256+
case EVT_KEY_BREAK(KEY_MINUS):
260257
case EVT_KEY_BREAK(KEY_PAGEUP):
261-
killEvents(event);
262258
chainMenu(menuStatisticsDebug2);
263259
break;
264260

265-
case EVT_KEY_FIRST(KEY_PLUS):
261+
case EVT_KEY_BREAK(KEY_PLUS):
266262
case EVT_KEY_BREAK(KEY_PAGEDN):
267263
chainMenu(menuStatisticsView);
268264
return;

‎radio/src/gui/colorlcd/select_fab_carousel.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ class SelectFabButton : public ButtonBase
123123
#if defined(HARDWARE_KEYS)
124124
switch (event) {
125125
case EVT_KEY_BREAK(KEY_EXIT):
126-
killEvents(event);
127126
parent->deleteLater();
128127
return;
129128
}

‎radio/src/gui/common/stdlcd/menus.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void chainMenu(MenuHandlerFunc newMenu)
5555

5656
void pushMenu(MenuHandlerFunc newMenu)
5757
{
58-
killEvents(KEY_ENTER);
58+
killEvents(KEY_ENTER); // TODO: Check if needed.
5959

6060
if (menuLevel == 0) {
6161
if (newMenu == menuRadioSetup)

‎radio/src/gui/common/stdlcd/model_module_options.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void menuModelModuleOptions(event_t event)
9191
}
9292

9393
if (menuEvent) {
94-
killEvents(KEY_EXIT);
94+
killEvents(KEY_EXIT); // TODO: Check if needed
9595
moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
9696
if (reusableBuffer.hardwareAndSettings.moduleSettings.dirty) {
9797
abortPopMenu();

‎radio/src/gui/common/stdlcd/model_receiver_options.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void menuModelReceiverOptions(event_t event)
106106
});
107107

108108
if (menuEvent) {
109-
killEvents(KEY_EXIT);
109+
killEvents(KEY_EXIT); // TODO: Check if needed
110110
moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
111111
if (reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
112112
abortPopMenu();

‎radio/src/gui/common/stdlcd/model_usbjoystick.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,14 @@ enum USBJFields {
5050

5151
void menuModelUSBJoystickOne(event_t event)
5252
{
53-
#if defined(KEYS_GPIO_REG_MDL)
54-
if (event == EVT_KEY_FIRST(KEY_MODEL)) {
55-
pushMenu(menuChannelsView);
56-
killEvents(event);
57-
}
58-
#elif defined(NAVIGATION_X7)
59-
if (event == EVT_KEY_FIRST(KEY_MENU)) {
53+
#if defined(NAVIGATION_XLITE)
54+
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
6055
pushMenu(menuChannelsView);
6156
killEvents(event);
6257
}
63-
#elif defined(NAVIGATION_XLITE)
64-
if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
58+
#else
59+
if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
6560
pushMenu(menuChannelsView);
66-
killEvents(event);
6761
}
6862
#endif
6963
USBJoystickChData * cch = usbJChAddress(s_currIdx);

0 commit comments

Comments
 (0)