Restore REPT event for PAGE key.

Add Lua events for 'hats as keys' radios.
EdgeTX · May 14, 2024 · ae2a3e2 · ae2a3e2
1 parent f7dd57c
commit ae2a3e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
@@ -331,7 +331,6 @@ void menuRadioSdManager(event_t _event)
           menuVerticalOffset = 0;
           menuVerticalPosition = HEADER_LINE;
           REFRESH_FILES();
-          killEvents(_event);
           return;
         }
       }

diff --git a/radio/src/keys.cpp b/radio/src/keys.cpp
@@ -437,8 +437,6 @@ bool keysPollingCycle()
       if (evt == EVT_KEY_LONG(KEY_PAGEDN)) {
         // Convert long press PAGEDN to short press PAGEUP
         evt = EVT_KEY_BREAK(KEY_PAGEUP);
-        // Block REPT and BREAK on KEY_PAGEDN
-        keys[i].killEvents();
       }
 #endif
 #if defined(KEYS_GPIO_REG_SHIFT)

diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -426,7 +426,6 @@ void NavWindow::onEvent(event_t event)
     case EVT_KEY_BREAK(KEY_PAGEUP):
       onPressPGUP();
       break;
-#endif
 #endif
 
     default:

diff --git a/radio/util/hw_defs/lua_keys.jinja b/radio/util/hw_defs/lua_keys.jinja
@@ -12,6 +12,7 @@
 {% set key_menu = keys | selectattr("key","==","KEY_MENU") | first %}
 {% set key_tele = keys | selectattr("key","==","KEY_TELE") | first %}
 {% set key_sys = keys | selectattr("key","==","KEY_SYS") | first %}
+{% set key_hats_as_keys = not key_pagedn and not key_menu and not key_up %}
 
 {% if key_plus %}
   LROT_NUMENTRY( EVT_VIRTUAL_PREV, EVT_KEY_FIRST(KEY_PLUS) )
@@ -55,7 +56,7 @@
   LROT_NUMENTRY( EVT_VIRTUAL_PREV_PAGE, EVT_KEY_BREAK(KEY_PAGEUP) )
   LROT_NUMENTRY( EVT_VIRTUAL_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGEDN) )
 
-  {% if key_model %}
+  {% if key_model or key_hats_as_keys %}
   LROT_NUMENTRY( EVT_VIRTUAL_MENU, EVT_KEY_BREAK(KEY_MODEL) )
   LROT_NUMENTRY( EVT_VIRTUAL_MENU_LONG, EVT_KEY_LONG(KEY_MODEL) )
   {% else %}
@@ -83,15 +84,15 @@ LROT_NUMENTRY( EVT_EXIT_BREAK, EVT_KEY_BREAK(KEY_EXIT) )
   {{ key_event('MENU','KEY_MENU') }}
 {% endif %}
 
-{% if key_tele %}
+{% if key_tele or key_hats_as_keys %}
   {{ key_event('TELEM','KEY_TELE') }}
 {% endif %}
 
-{% if key_model %}
+{% if key_model or key_hats_as_keys %}
   {{ key_event('MODEL','KEY_MODEL') }}
 {% endif %}
 
-{% if key_sys %}
+{% if key_sys or key_hats_as_keys %}
   {{ key_event('SYS','KEY_SYS') }}
 {% endif %}
 
@@ -102,18 +103,20 @@ LROT_NUMENTRY( EVT_EXIT_BREAK, EVT_KEY_BREAK(KEY_EXIT) )
   {{ key_event('RIGHT', 'KEY_RIGHT') }}
 {% endif %}
 
-{% if key_pageup %}
+{% if key_pageup or key_hats_as_keys %}
   {{ key_event('PAGEUP', 'KEY_PAGEUP') }}
   {{ key_event('PAGEDN', 'KEY_PAGEDN') }}
 {% elif key_pagedn %}
   {% if key_menu %}
     LROT_NUMENTRY( EVT_PAGE_FIRST, EVT_KEY_FIRST(KEY_PAGEDN) )
     LROT_NUMENTRY( EVT_PAGE_BREAK, EVT_KEY_BREAK(KEY_PAGEDN) )
     LROT_NUMENTRY( EVT_PAGE_LONG, EVT_KEY_BREAK(KEY_PAGEUP) )
+    LROT_NUMENTRY( EVT_PAGE_REPT, EVT_KEY_REPT(KEY_PAGEDN) )
   {% else %}
     LROT_NUMENTRY( EVT_PAGEDN_FIRST, EVT_KEY_FIRST(KEY_PAGEDN) )
     LROT_NUMENTRY( EVT_PAGEDN_BREAK, EVT_KEY_BREAK(KEY_PAGEDN) )
     LROT_NUMENTRY( EVT_PAGEDN_LONG, EVT_KEY_BREAK(KEY_PAGEUP) )
+    LROT_NUMENTRY( EVT_PAGEDN_REPT, EVT_KEY_REPT(KEY_PAGEDN) )
   {% endif %}
 {% endif %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -426,7 +426,6 @@ void NavWindow::onEvent(event_t event) @@
         case EVT_KEY_BREAK(KEY_PAGEUP):
           onPressPGUP();
           break;
-    #endif
     #endif
         default:
@@ Expand Down @@