me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Soldering.cpp

Browse Source 
allow unlock during locked warning
This commit is contained in:
neon12345
2024-08-11 00:38:22 +02:00
committed by GitHub
parent dfbf45a1c4
commit d8b7c73b8e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/Core/Threads/UI/logic/Soldering.cpp
View File

@@ -9,6 +9,18 @@
OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) { OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) {
if (cxt->scratch_state.state1 >= 2) { if (cxt->scratch_state.state1 >= 2) {
// Buttons are currently locked // Buttons are currently locked
if (buttons == BUTTON_BOTH_LONG) {
if (cxt->scratch_state.state1 == 3) {
// Unlocking
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
cxt->scratch_state.state1 = 1;
cxt->scratch_state.state7 = 0;
}
} else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
}
return OperatingMode::Soldering;
}
if (cxt->scratch_state.state7 != 0) { if (cxt->scratch_state.state7 != 0) {
// show locked until timer is up // show locked until timer is up
if (xTaskGetTickCount() >= cxt->scratch_state.state7) { if (xTaskGetTickCount() >= cxt->scratch_state.state7) {
@@ -19,16 +31,6 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
} }
} }
switch (buttons) { switch (buttons) {
case BUTTON_BOTH_LONG:
if (cxt->scratch_state.state1 == 3) {
// Unlocking
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
cxt->scratch_state.state1 = 1;
}
} else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
}
break;
case BUTTON_NONE: case BUTTON_NONE:
cxt->scratch_state.state1 = 3; cxt->scratch_state.state1 = 3;
break; break;