diff --git a/radio/src/keys.h b/radio/src/keys.h index d2cb37d99..ac166870c 100644 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -34,8 +34,6 @@ constexpr event_t _MSK_KEY_REPT = 0x0400; constexpr event_t _MSK_KEY_FIRST = 0x0600; constexpr event_t _MSK_KEY_LONG = 0x0800; constexpr event_t _MSK_KEY_FLAGS = 0x0E00; -constexpr event_t EVT_ENTRY = 0x1000; -constexpr event_t EVT_ENTRY_UP = 0x2000; #else constexpr event_t _MSK_KEY_BREAK = 0x20; constexpr event_t _MSK_KEY_REPT = 0x40; @@ -46,6 +44,12 @@ constexpr event_t EVT_ENTRY = 0xBF; constexpr event_t EVT_ENTRY_UP = 0xBE; #endif +#if defined(HARDWARE_TOUCH) +constexpr event_t _MSK_VIRTUAL_KEY = 0x1000; +#endif + +#define EVT_VIRTUAL_KEY(key) ((key) | _MSK_VIRTUAL_KEY) + // normal order of events is: FIRST, LONG, REPEAT, REPEAT, ..., BREAK #define EVT_KEY_FIRST(key) ((key)|_MSK_KEY_FIRST) // fired when key is pressed #define EVT_KEY_LONG(key) ((key)|_MSK_KEY_LONG) // fired when key is held pressed for a while diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 4b8d4629c..9807aaec0 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 4b8d4629c2151806ccf00e303b0b48e88dfb1575 +Subproject commit 9807aaec0d8b85c786ce032abb00652c77e457cd