fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reworked function latch. Now, the latch is silently released on the next key press event which is outside the timeout.

This commit is contained in:
vk7js 2022-05-31 09:38:18 +10:00 committed by Silvano Seva
parent da935ff710
commit bc7ce57f9b
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openrtx/src/ui/ui.c
View File

@ -82,15 +82,30 @@
// 0 not latched, a positive number start timer which counts down to 0 at which // 0 not latched, a positive number start timer which counts down to 0 at which
// time latch automatically disabled. // time latch automatically disabled.
// If a subsequent key is pressed before timeout, timer restarts. // If a subsequent key is pressed before timeout, timer restarts.
static uint16_t functionLatched = 0; static uint16_t functionLatchTimer = 0;
// 3000 ms. // 3000 ms.
#define FUNCTION_LATCH_TIMEOUT 3000 #define FUNCTION_LATCH_TIMEOUT 3000
// When a key is pressed while Moni is latched, the latch timer is restarted. // When a key is pressed while Moni is latched, the latch timer is restarted.
static void RestartFunctionLatchTimer() static void RestartFunctionLatchTimer()
{ {
if (functionLatched == 0) return; if (functionLatchTimer == 0) return;
functionLatched = FUNCTION_LATCH_TIMEOUT; functionLatchTimer = getTick() + FUNCTION_LATCH_TIMEOUT;
}
static void ReleaseFunctionLatchIfNeeded()
{
if (functionLatchTimer == 0) return;
if (getTick() < functionLatchTimer)
return;
functionLatchTimer=0;
}
static void SetFunctionLatchTimer()
{
functionLatchTimer= getTick() + FUNCTION_LATCH_TIMEOUT;
} }
/* UI main screen functions, their implementation is in "ui_main.c" */ /* UI main screen functions, their implementation is in "ui_main.c" */
@ -1085,20 +1100,18 @@ void ui_updateFSM(bool *sync_rtx)
// If MONI is pressed, activate MACRO functions // If MONI is pressed, activate MACRO functions
bool moniPressed=(msg.keys & KEY_MONI) ? true : false; bool moniPressed=(msg.keys & KEY_MONI) ? true : false;
if(moniPressed || (functionLatched > 0)) if(moniPressed || ((functionLatchTimer > 0) && (getTick() < functionLatchTimer) ))
{ {
macro_menu = true; macro_menu = true;
// long press moni on its own latches function. // long press moni on its own latches function.
if (moniPressed && msg.long_press && !input_getPressedNumber(msg)) if (moniPressed && msg.long_press && !input_getPressedNumber(msg))
{ {
functionLatched = FUNCTION_LATCH_TIMEOUT; // 3000 ms. SetFunctionLatchTimer(); // 3000 ms.
// Need to play beep to alert latch state enabled. // Need to play beep to alert latch state enabled.
} }
else if (functionLatched > 0) else
{ {
functionLatched--; // count down. ReleaseFunctionLatchIfNeeded();
//if (functionLatched==0)
// need to beep to alert latch timed out.
} }
_ui_fsm_menuMacro(msg, sync_rtx); _ui_fsm_menuMacro(msg, sync_rtx);
return; return;