sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Add auto-repeat to settings menu

Browse Source
This commit is contained in:
Ben V. Brown
2023-07-20 22:30:50 +10:00
parent 63db049311
commit 7e13686276
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/Core/Threads/OperatingModes/SettingsMenu.cpp
View File

@@ -73,6 +73,8 @@ OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
uint16_t *subEntry = &(cxt->scratch_state.state2); uint16_t *subEntry = &(cxt->scratch_state.state2);
uint16_t *currentMenuLength = &(cxt->scratch_state.state5); uint16_t *currentMenuLength = &(cxt->scratch_state.state5);
uint16_t *wasRenderingHelp = &(cxt->scratch_state.state6); uint16_t *wasRenderingHelp = &(cxt->scratch_state.state6);
uint32_t *autoRepeatAcceleration = &(cxt->scratch_state.state3);
uint32_t *autoRepeatTimer = &(cxt->scratch_state.state4);
const menuitem *currentMenu; const menuitem *currentMenu;
// Draw the currently on screen item // Draw the currently on screen item
@@ -105,26 +107,34 @@ OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
auto callIncrementHandler = [&]() { auto callIncrementHandler = [&]() {
if ((int)currentMenu[currentScreen].autoSettingOption < (int)SettingsOptions::SettingsOptionsLength) { if ((int)currentMenu[currentScreen].autoSettingOption < (int)SettingsOptions::SettingsOptionsLength) {
nextSettingValue(currentMenu[currentScreen].autoSettingOption); return nextSettingValue(currentMenu[currentScreen].autoSettingOption);
} else if (currentMenu[currentScreen].incrementHandler != nullptr) { } else if (currentMenu[currentScreen].incrementHandler != nullptr) {
currentMenu[currentScreen].incrementHandler(); return currentMenu[currentScreen].incrementHandler();
} }
return false;
}; };
// //
switch (buttons) { switch (buttons) {
case BUTTON_NONE: case BUTTON_NONE:
(*autoRepeatAcceleration) = 0; // reset acceleration
(*autoRepeatTimer) = 0; // reset acceleration
break; break;
case BUTTON_BOTH: case BUTTON_BOTH:
return OperatingMode::HomeScreen; return OperatingMode::HomeScreen;
break; break;
case BUTTON_B_LONG:
break;
case BUTTON_F_LONG: case BUTTON_F_LONG:
if (xTaskGetTickCount() + (*autoRepeatAcceleration) > (*autoRepeatTimer) + PRESS_ACCEL_INTERVAL_MAX) {
if (callIncrementHandler()) {
(*autoRepeatTimer) = 1000;
} else {
(*autoRepeatTimer) = 0;
}
(*autoRepeatTimer) += xTaskGetTickCount();
(*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
}
break; break;
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
// Increment setting // Increment setting
@@ -144,6 +154,14 @@ OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
} }
} }
break; break;
case BUTTON_B_LONG:
if (xTaskGetTickCount() - (*autoRepeatTimer) + (*autoRepeatAcceleration) > PRESS_ACCEL_INTERVAL_MAX) {
(*autoRepeatTimer) = xTaskGetTickCount();
(*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
} else {
break;
}
/* Fall through*/
case BUTTON_B_SHORT: case BUTTON_B_SHORT:
// Increment menu item // Increment menu item
if (*wasRenderingHelp) { if (*wasRenderingHelp) {
@@ -173,6 +191,7 @@ OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
} }
} }
break; break;
default: default:
break; break;
} }