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

Update Soldering.cpp

Browse Source 
show the locked warning for half a second
This commit is contained in:
neon12345
2024-08-01 05:41:07 +02:00
committed by GitHub
parent c0ba6eb30d
commit ae55d5c3de
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,12 +9,16 @@
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
switch (buttons) { if (cxt->scratch_state.state1 > 3) {
case BUTTON_F_LONG: // show locked until timer is up
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) { if ((cxt->scratch_state.state1 >> 2) < xTaskGetTickCount()) {
cxt->scratch_state.state2 = 1; cxt->scratch_state.state1 &= 3;
} else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
return OperatingMode::Soldering;
} }
break; }
switch (buttons) {
case BUTTON_BOTH_LONG: case BUTTON_BOTH_LONG:
if (cxt->scratch_state.state1 == 3) { if (cxt->scratch_state.state1 == 3) {
// Unlocking // Unlocking
@@ -28,7 +32,14 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
case BUTTON_NONE: case BUTTON_NONE:
cxt->scratch_state.state1 = 3; cxt->scratch_state.state1 = 3;
break; break;
default: // Do nothing and display a lock warning case BUTTON_F_LONG:
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) {
cxt->scratch_state.state2 = 1;
break;
}
/*Fall through*/
default: // Set timer for and display a lock warning
cxt->scratch_state.state1 |= (xTaskGetTickCount() + TICKS_SECOND / 2) << 2;
warnUser(translatedString(Tr->WarningKeysLockedString), buttons); warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
break; break;
} }