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

Merge pull request #826 from alvinhochun/temp-chg-menu-fix

Browse Source 
Fix temp. adjust menu button behaviour
This commit is contained in:
Ben V. Brown
2021-01-26 23:13:43 +11:00
committed by GitHub
parent 24ac60f6dd dcd40a1bc7
commit 5e372310cd
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/Core/Threads/GUIThread.cpp
View File

@@ -180,20 +180,33 @@ static void gui_drawBatteryIcon() {
#endif #endif
} }
static void gui_solderingTempAdjust() { static void gui_solderingTempAdjust() {
uint32_t lastChange = xTaskGetTickCount(); uint32_t lastChange = xTaskGetTickCount();
currentTempTargetDegC = 0; currentTempTargetDegC = 0;
uint32_t autoRepeatTimer = 0; uint32_t autoRepeatTimer = 0;
uint8_t autoRepeatAcceleration = 0; uint8_t autoRepeatAcceleration = 0;
bool waitForRelease = false;
ButtonState buttons = getButtonState();
if (buttons != BUTTON_NONE) {
// Temp adjust entered by long-pressing F button.
waitForRelease = true;
}
for (;;) { for (;;) {
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::clearScreen(); OLED::clearScreen();
OLED::setFont(0); OLED::setFont(0);
ButtonState buttons = getButtonState(); buttons = getButtonState();
if (buttons) if (buttons) {
if (waitForRelease) {
buttons = BUTTON_NONE;
}
lastChange = xTaskGetTickCount(); lastChange = xTaskGetTickCount();
} else {
waitForRelease = false;
}
switch (buttons) { switch (buttons) {
case BUTTON_NONE: case BUTTON_NONE:
// stay // stay
autoRepeatAcceleration = 0;
break; break;
case BUTTON_BOTH: case BUTTON_BOTH:
// exit // exit