j/armchair_fw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change status-screen-scroll to require 2 clicks

Browse Source 
to prevent confusion, made it harder to switch page
accidentially and easier to return to overview

- 2 rotate-clicks necessary for status page to switch
- if only one received within timeout it gets switched to default screen
This commit is contained in:
jonny_l480 2024-08-31 20:14:38 +02:00
parent a2b67c1a40
commit ff98d3f5eb
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
board_single/main/button.cpp
View File

@ -178,6 +178,7 @@ void buttonCommands::startHandleLoop()
//-- variables -- //-- variables --
bool isPressed = false; bool isPressed = false;
static rotary_encoder_event_t event; // store event data static rotary_encoder_event_t event; // store event data
int rotateCount = 0; // temporary count clicks encoder was rotated
// int count = 0; (from class) // int count = 0; (from class)
while (1) while (1)
@ -211,16 +212,18 @@ void buttonCommands::startHandleLoop()
isPressed = false; // rest stored state isPressed = false; // rest stored state
break; break;
case RE_ET_CHANGED: // scroll through status pages when simply rotating encoder case RE_ET_CHANGED: // scroll through status pages when simply rotating encoder
if (event.diff > 0) rotateCount++;
if (rotateCount >= 2) // at least two rotate-clicks necessary for one page switch
{ {
display_rotateStatusPage(true, true); //select NEXT status screen, stau at last element (dont rotate to first) if (event.diff > 0)
buzzer->beep(1, 65, 0); display_rotateStatusPage(true, true); // select NEXT status screen, stay at last element (dont rotate to first)
else
display_rotateStatusPage(false, true); // select PREVIOUS status screen, stay at first element (dont rotate to last)
rotateCount = 0;
buzzer->beep(1, 90, 0);
} }
else else
{
display_rotateStatusPage(false, true); //select PREVIOUS status screen, stay at first element (dont rotate to last)
buzzer->beep(1, 65, 0); buzzer->beep(1, 65, 0);
}
break; break;
case RE_ET_BTN_LONG_PRESSED: case RE_ET_BTN_LONG_PRESSED:
case RE_ET_BTN_CLICKED: case RE_ET_BTN_CLICKED:
@ -230,6 +233,16 @@ void buttonCommands::startHandleLoop()
} }
else // timeout (no event received within TIMEOUT) else // timeout (no event received within TIMEOUT)
{ {
// switch back to default status screen in case less than 2 rotate-clicks received
if (rotateCount != 0)
{
rotateCount = 0;
display_selectStatusPage(STATUS_SCREEN_OVERVIEW);
//TODO only change/beep if not already at STATUS_SCREEN_OVERVIEW
//buzzer->beep(1, 100, 0);
}
// encoder was pressed
if (count > 0) if (count > 0)
{ {
//-- run action with count of presses -- //-- run action with count of presses --