Remove more killEvents() calls and change FIRST to BREAK.

EdgeTX · May 14, 2024 · b5400a9 · b5400a9
1 parent ae2a3e2
commit b5400a9
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 62 deletions.
diff --git a/radio/src/gui/128x64/model_curve_edit.cpp b/radio/src/gui/128x64/model_curve_edit.cpp
@@ -157,24 +157,17 @@ void menuModelCurveOne(event_t event)
       }
       break;
 
-#if defined(KEYS_GPIO_REG_MDL)
-    case EVT_KEY_FIRST(KEY_MODEL):
-      pushMenu(menuChannelsView);
+#if defined(NAVIGATION_XLITE)
+    case EVT_KEY_FIRST(KEY_ENTER):
+      if (!keysGetState(KEY_SHIFT))
+        break;
       killEvents(event);
-      break;
-#elif defined(NAVIGATION_X7)
-    case EVT_KEY_FIRST(KEY_MENU):
+#else
+    case EVT_KEY_BREAK(KEY_MODEL):
+    case EVT_KEY_BREAK(KEY_MENU):
+#endif
       pushMenu(menuChannelsView);
-      killEvents(event);
       break;
-#elif defined(NAVIGATION_XLITE)
-    case EVT_KEY_FIRST(KEY_ENTER):
-      if (keysGetState(KEY_SHIFT)) {
-        pushMenu(menuChannelsView);
-        killEvents(event);
-      }
-      break;
-#endif
   }
 
   drawCurve();

diff --git a/radio/src/gui/128x64/model_input_edit.cpp b/radio/src/gui/128x64/model_input_edit.cpp
@@ -57,20 +57,14 @@ uint8_t FM_ROW(uint8_t value)
 
 void menuModelExpoOne(event_t event)
 {
-#if defined(KEYS_GPIO_REG_MDL)
-  if (event == EVT_KEY_FIRST(KEY_MODEL)) {
-    pushMenu(menuChannelsView);
-    killEvents(event);
-  }
-#elif defined(NAVIGATION_X7)
-  if (event == EVT_KEY_FIRST(KEY_MENU)) {
+#if defined(NAVIGATION_XLITE)
+  if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
     pushMenu(menuChannelsView);
     killEvents(event);
   }
-#elif defined(NAVIGATION_XLITE)
-  if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
+#else
+  if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
     pushMenu(menuChannelsView);
-    killEvents(event);
   }
 #endif
   ExpoData * ed = expoAddress(s_currIdx);

diff --git a/radio/src/gui/128x64/model_mix_edit.cpp b/radio/src/gui/128x64/model_mix_edit.cpp
@@ -90,20 +90,14 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
 
 void menuModelMixOne(event_t event)
 {
-#if defined(KEYS_GPIO_REG_MDL)
-  if (event == EVT_KEY_FIRST(KEY_MODEL)) {
-    pushMenu(menuChannelsView);
-    killEvents(event);
-  }
-#elif defined(NAVIGATION_X7)
-  if (event == EVT_KEY_FIRST(KEY_MENU)) {
+#if defined(NAVIGATION_XLITE)
+  if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
     pushMenu(menuChannelsView);
     killEvents(event);
   }
-#elif defined(NAVIGATION_XLITE)
-  if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
+#else
+  if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
     pushMenu(menuChannelsView);
-    killEvents(event);
   }
 #endif
   MixData * md2 = mixAddress(s_currIdx) ;

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
@@ -1767,10 +1767,10 @@ void menuModelSetup(event_t event)
                   if (isModuleR9MNonAccess(moduleIdx) || isModuleD16(moduleIdx) || isModuleAFHDS3(moduleIdx)) {
 #if defined(PCBXLITE)
                     if (EVT_KEY_MASK(event) == KEY_ENTER) {
+                      killEvents(event);
 #else
                     if (event == EVT_KEY_BREAK(KEY_ENTER)) {
 #endif
-                      killEvents(event);
 #if defined(AFHDS3)
                       if (isModuleAFHDS3(moduleIdx)) {
                         startBindMenuAfhds3(moduleIdx);

diff --git a/radio/src/gui/212x64/view_statistics.cpp b/radio/src/gui/212x64/view_statistics.cpp
@@ -33,14 +33,13 @@ void menuStatisticsView(event_t event)
   title(STR_MENUSTAT);
 
   switch(event) {
-    case EVT_KEY_FIRST(KEY_PLUS):
+    case EVT_KEY_BREAK(KEY_PLUS):
     case EVT_KEY_BREAK(KEY_PAGEDN):
       chainMenu(menuStatisticsDebug);
       break;
 
-    case EVT_KEY_FIRST(KEY_MINUS):
+    case EVT_KEY_BREAK(KEY_MINUS):
     case EVT_KEY_BREAK(KEY_PAGEUP):
-      killEvents(event);
 #if defined(DEBUG_TRACE_BUFFER)
       chainMenu(menuTraceBuffer);
 #else
@@ -133,15 +132,14 @@ void menuStatisticsDebug(event_t event)
       maxMixerDuration  = 0;
       break;
 
-    case EVT_KEY_FIRST(KEY_PLUS):
+    case EVT_KEY_BREAK(KEY_PLUS):
     case EVT_KEY_BREAK(KEY_PAGEDN):
       disableVBatBridge();
       chainMenu(menuStatisticsDebug2);
       break;
 
-    case EVT_KEY_FIRST(KEY_MINUS):
+    case EVT_KEY_BREAK(KEY_MINUS):
     case EVT_KEY_BREAK(KEY_PAGEUP):
-      killEvents(event);
       disableVBatBridge();
       chainMenu(menuStatisticsView);
       break;
@@ -214,7 +212,7 @@ void menuStatisticsDebug2(event_t event)
   title(STR_MENUDEBUG);
 
   switch(event) {
-    case EVT_KEY_FIRST(KEY_PLUS):
+    case EVT_KEY_BREAK(KEY_PLUS):
     case EVT_KEY_BREAK(KEY_PAGEDN):
 #if defined(DEBUG_TRACE_BUFFER)
       chainMenu(menuTraceBuffer);
@@ -223,9 +221,8 @@ void menuStatisticsDebug2(event_t event)
 #endif
       return;
 
-    case EVT_KEY_FIRST(KEY_MINUS):
+    case EVT_KEY_BREAK(KEY_MINUS):
     case EVT_KEY_BREAK(KEY_PAGEUP):
-      killEvents(event);
       chainMenu(menuStatisticsDebug);
       break;
 
@@ -256,13 +253,12 @@ void menuTraceBuffer(event_t event)
       dumpTraceBuffer();
       break;
 
-    case EVT_KEY_FIRST(KEY_MINUS):
+    case EVT_KEY_BREAK(KEY_MINUS):
     case EVT_KEY_BREAK(KEY_PAGEUP):
-      killEvents(event);
       chainMenu(menuStatisticsDebug2);
       break;
 
-    case EVT_KEY_FIRST(KEY_PLUS):
+    case EVT_KEY_BREAK(KEY_PLUS):
     case EVT_KEY_BREAK(KEY_PAGEDN):
       chainMenu(menuStatisticsView);
       return;

diff --git a/radio/src/gui/colorlcd/select_fab_carousel.cpp b/radio/src/gui/colorlcd/select_fab_carousel.cpp
@@ -123,7 +123,6 @@ class SelectFabButton : public ButtonBase
 #if defined(HARDWARE_KEYS)
     switch (event) {
       case EVT_KEY_BREAK(KEY_EXIT):
-        killEvents(event);
         parent->deleteLater();
         return;
     }

diff --git a/radio/src/gui/common/stdlcd/menus.cpp b/radio/src/gui/common/stdlcd/menus.cpp
@@ -55,7 +55,7 @@ void chainMenu(MenuHandlerFunc newMenu)
 
 void pushMenu(MenuHandlerFunc newMenu)
 {
-  killEvents(KEY_ENTER);
+  killEvents(KEY_ENTER); // TODO: Check if needed.
 
   if (menuLevel == 0) {
     if (newMenu == menuRadioSetup)

diff --git a/radio/src/gui/common/stdlcd/model_module_options.cpp b/radio/src/gui/common/stdlcd/model_module_options.cpp
@@ -91,7 +91,7 @@ void menuModelModuleOptions(event_t event)
   }
 
   if (menuEvent) {
-    killEvents(KEY_EXIT);
+    killEvents(KEY_EXIT); // TODO: Check if needed
     moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
     if (reusableBuffer.hardwareAndSettings.moduleSettings.dirty) {
       abortPopMenu();

diff --git a/radio/src/gui/common/stdlcd/model_receiver_options.cpp b/radio/src/gui/common/stdlcd/model_receiver_options.cpp
@@ -106,7 +106,7 @@ void menuModelReceiverOptions(event_t event)
   });
 
   if (menuEvent) {
-    killEvents(KEY_EXIT);
+    killEvents(KEY_EXIT); // TODO: Check if needed
     moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
     if (reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
       abortPopMenu();

diff --git a/radio/src/gui/common/stdlcd/model_usbjoystick.cpp b/radio/src/gui/common/stdlcd/model_usbjoystick.cpp
@@ -50,20 +50,14 @@ enum USBJFields {
 
 void menuModelUSBJoystickOne(event_t event)
 {
-#if defined(KEYS_GPIO_REG_MDL)
-  if (event == EVT_KEY_FIRST(KEY_MODEL)) {
-    pushMenu(menuChannelsView);
-    killEvents(event);
-  }
-#elif defined(NAVIGATION_X7)
-  if (event == EVT_KEY_FIRST(KEY_MENU)) {
+#if defined(NAVIGATION_XLITE)
+  if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
     pushMenu(menuChannelsView);
     killEvents(event);
   }
-#elif defined(NAVIGATION_XLITE)
-  if (event == EVT_KEY_FIRST(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
+#else
+  if (event == EVT_KEY_BREAK(KEY_MODEL) || event == EVT_KEY_BREAK(KEY_MENU)) {
     pushMenu(menuChannelsView);
-    killEvents(event);
   }
 #endif
   USBJoystickChData * cch = usbJChAddress(s_currIdx);