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

Refactoring

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-10-21 01:52:05 +02:00
parent 146c8dede4
commit b59df11bd6
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/app.c
View File

@@ -1210,7 +1210,7 @@ void APP_CheckKeys(void)
if (gDebounceCounter == key_debounce_10ms) // debounced new key pressed if (gDebounceCounter == key_debounce_10ms) // debounced new key pressed
{ {
if (Key == KEY_INVALID) //all PTT keys released if (Key == KEY_INVALID) //all non PTT keys released
{ {
if (gKeyReading1 != KEY_INVALID) // some button was pressed before if (gKeyReading1 != KEY_INVALID) // some button was pressed before
{ {
@@ -1236,16 +1236,16 @@ void APP_CheckKeys(void)
if (Key != KEY_PTT) if (Key != KEY_PTT)
{ {
gKeyBeingHeld = true; gKeyBeingHeld = true;
APP_ProcessKey(Key, true, true); APP_ProcessKey(Key, true, true); // key held event
} }
} }
else //subsequent fast key repeats else //subsequent fast key repeats
{ {
if (Key == KEY_UP || Key == KEY_DOWN) if (Key == KEY_UP || Key == KEY_DOWN) // fast key repeats for up/down buttons
{ {
gKeyBeingHeld = true; gKeyBeingHeld = true;
if ((gDebounceCounter % key_repeat_10ms) == 0) if ((gDebounceCounter % key_repeat_10ms) == 0)
APP_ProcessKey(Key, true, true); APP_ProcessKey(Key, true, true); // key held event
} }
if (gDebounceCounter < 0xFFFF) if (gDebounceCounter < 0xFFFF)
@@ -1946,8 +1946,6 @@ void APP_TimeSlice500ms(void)
static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{ {
bool bFlag = false;
const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
if (Key == KEY_EXIT && !backlight_was_on && gEeprom.BACKLIGHT > 0) if (Key == KEY_EXIT && !backlight_was_on && gEeprom.BACKLIGHT > 0)
@@ -2052,10 +2050,9 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
return; return;
} }
} }
else else if (Key != KEY_SIDE1 && Key != KEY_SIDE2)
if (Key != KEY_SIDE1 && Key != KEY_SIDE2)
{ {
if (!bKeyPressed || bKeyHeld) if (!bKeyPressed || bKeyHeld) // released or held
return; return;
// keypad is locked, tell the user // keypad is locked, tell the user
@@ -2076,6 +2073,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
} }
} }
bool bFlag = false;
if (Key == KEY_PTT) if (Key == KEY_PTT)
{ {
if (gPttWasPressed) if (gPttWasPressed)
@@ -2186,8 +2184,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
} }
#endif #endif
} }
else else if (Key != KEY_SIDE1 && Key != KEY_SIDE2)
if (Key != KEY_SIDE1 && Key != KEY_SIDE2)
{ {
switch (gScreenToDisplay) switch (gScreenToDisplay)
{ {