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

extracted logic for testing if the function key is latched into its own function for readability.

This commit is contained in:
vk7js 2022-05-31 10:00:15 +10:00 committed by Silvano Seva
parent bc7ce57f9b
commit 9038745b6f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,10 @@ static void SetFunctionLatchTimer()
{ {
functionLatchTimer= getTick() + FUNCTION_LATCH_TIMEOUT; functionLatchTimer= getTick() + FUNCTION_LATCH_TIMEOUT;
} }
static bool FunctionKeyIsLatched()
{
return (functionLatchTimer > 0) && (getTick() < functionLatchTimer);
}
/* UI main screen functions, their implementation is in "ui_main.c" */ /* UI main screen functions, their implementation is in "ui_main.c" */
extern void _ui_drawMainBackground(); extern void _ui_drawMainBackground();
extern void _ui_drawMainTop(); extern void _ui_drawMainTop();
@ -1100,8 +1103,8 @@ 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 || ((functionLatchTimer > 0) && (getTick() < functionLatchTimer) )) if(moniPressed || FunctionKeyIsLatched())
{ {
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))