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

Fix settings button handling

Browse Source
This commit is contained in:
Ben V. Brown
2017-10-18 20:15:23 +11:00
parent 046f2df6a1
commit 88b874681b
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
workspace/TS100/src/main.cpp
View File

@@ -296,11 +296,28 @@ static void gui_settingsMenu() {
lcd.clearScreen(); lcd.clearScreen();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
if (HAL_GetTick() - lastButtonTime < 4000) {
settingsMenu[currentScreen].draw.func();
} else {
//Draw description
//draw string starting from descriptionOffset
int16_t maxOffset = strlen(settingsMenu[currentScreen].description) + 5;
if (descriptionStart == 0)
descriptionStart = HAL_GetTick();
int16_t descriptionOffset = (((HAL_GetTick() - descriptionStart) / 150) % maxOffset);
//^ Rolling offset based on time
lcd.setCursor(12 * (7 - descriptionOffset), 0);
lcd.print(settingsMenu[currentScreen].description);
}
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
switch (buttons) { switch (buttons) {
case BUTTON_BOTH: case BUTTON_BOTH:
earlyExit = true; //will make us exit next loop earlyExit = true; //will make us exit next loop
descriptionStart = 0;
break; break;
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
//increment //increment
@@ -319,34 +336,20 @@ static void gui_settingsMenu() {
if (HAL_GetTick() - autoRepeatTimer > 200) { if (HAL_GetTick() - autoRepeatTimer > 200) {
settingsMenu[currentScreen].incrementHandler.func(); settingsMenu[currentScreen].incrementHandler.func();
autoRepeatTimer = HAL_GetTick(); autoRepeatTimer = HAL_GetTick();
descriptionStart = 0;
} }
break; break;
case BUTTON_B_LONG: case BUTTON_B_LONG:
if (HAL_GetTick() - autoRepeatTimer > 200) { if (HAL_GetTick() - autoRepeatTimer > 200) {
currentScreen++; currentScreen++;
autoRepeatTimer = HAL_GetTick(); autoRepeatTimer = HAL_GetTick();
descriptionStart = 0;
} }
break; break;
case BUTTON_NONE: case BUTTON_NONE:
break; break;
} }
if (HAL_GetTick() - lastButtonTime < 4000) {
settingsMenu[currentScreen].draw.func();
} else {
//Draw description
//draw string starting from descriptionOffset
int16_t maxOffset = strlen(settingsMenu[currentScreen].description) + 5;
if (descriptionStart == 0)
descriptionStart = HAL_GetTick();
int16_t descriptionOffset = (((HAL_GetTick() - descriptionStart) / 150) % maxOffset);
//^ Rolling offset based on time
lcd.setCursor(12 * (7 - descriptionOffset), 0);
lcd.print(settingsMenu[currentScreen].description);
}
lcd.refresh(); //update the LCD lcd.refresh(); //update the LCD
GUIDelay(); GUIDelay();
HAL_IWDG_Refresh(&hiwdg); HAL_IWDG_Refresh(&hiwdg);