BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Code refactoring

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-10-17 21:47:39 +02:00
parent 96144af9e9
commit f11d0fbcda
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/action.c
View File

@@ -326,18 +326,15 @@ void ACTION_Scan(bool bRestart)
void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{ {
uint8_t Short = ACTION_OPT_NONE; if (gScreenToDisplay == DISPLAY_MAIN && gDTMF_InputMode) // entering DTMF code
uint8_t Long = ACTION_OPT_NONE;
if (gScreenToDisplay == DISPLAY_MAIN && gDTMF_InputMode)
{ {
if (Key == KEY_SIDE1 && !bKeyHeld && bKeyPressed) if (Key == KEY_SIDE1 && !bKeyHeld && bKeyPressed) // side1 btn pressed
{ {
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
if (gDTMF_InputBox_Index > 0) if (gDTMF_InputBox_Index > 0) // DTMF codes are in the input box
{ {
gDTMF_InputBox[--gDTMF_InputBox_Index] = '-'; gDTMF_InputBox[--gDTMF_InputBox_Index] = '-'; // delete one code
if (gDTMF_InputBox_Index > 0) if (gDTMF_InputBox_Index > 0)
{ {
gPttWasReleased = true; gPttWasReleased = true;
@@ -351,43 +348,47 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
#endif #endif
gRequestDisplayScreen = DISPLAY_MAIN; gRequestDisplayScreen = DISPLAY_MAIN;
gDTMF_InputMode = false; gDTMF_InputMode = false; // turn off DTMF input box if no codes left
} }
gPttWasReleased = true; gPttWasReleased = true;
return; return;
} }
uint8_t funcShort = ACTION_OPT_NONE;
uint8_t funcLong = ACTION_OPT_NONE;
if (Key == KEY_SIDE1) if (Key == KEY_SIDE1)
{ {
Short = gEeprom.KEY_1_SHORT_PRESS_ACTION; funcShort = gEeprom.KEY_1_SHORT_PRESS_ACTION;
Long = gEeprom.KEY_1_LONG_PRESS_ACTION; funcLong = gEeprom.KEY_1_LONG_PRESS_ACTION;
} }
else else if (Key == KEY_SIDE2)
if (Key == KEY_SIDE2)
{ {
Short = gEeprom.KEY_2_SHORT_PRESS_ACTION; funcShort = gEeprom.KEY_2_SHORT_PRESS_ACTION;
Long = gEeprom.KEY_2_LONG_PRESS_ACTION; funcLong = gEeprom.KEY_2_LONG_PRESS_ACTION;
} }
if (!bKeyHeld && bKeyPressed) if (!bKeyHeld && bKeyPressed) // button pushed
{ {
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
return; return;
} }
if (bKeyHeld || bKeyPressed) // held or released beyond this point
if (bKeyHeld || bKeyPressed) // held
{ {
if (!bKeyHeld) funcShort = funcLong;
return;
Short = Long; if (!bKeyPressed) //ignore release if held
if (!bKeyPressed)
return; return;
} }
switch (Short) // held or released after short press beyond this point
switch (funcShort)
{ {
default: default:
case ACTION_OPT_NONE: case ACTION_OPT_NONE: