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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
discip
2024-08-13 22:25:42 +02:00
committed by GitHub
parent 9811875946 adfc521122
commit 65c3eed360
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/Core/Threads/UI/logic/OperatingModes.h
View File

@@ -62,6 +62,7 @@ struct guiContext {
uint32_t state4; // 32 bit state scratch uint32_t state4; // 32 bit state scratch
uint16_t state5; // 16 bit state scratch uint16_t state5; // 16 bit state scratch
uint16_t state6; // 16 bit state scratch uint16_t state6; // 16 bit state scratch
uint32_t state7; // 32 bit state scratch
} scratch_state; } scratch_state;
}; };

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

@@ -9,26 +9,39 @@
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 (buttons == BUTTON_BOTH_LONG) {
case BUTTON_F_LONG:
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) {
cxt->scratch_state.state2 = 1;
}
break;
case BUTTON_BOTH_LONG:
if (cxt->scratch_state.state1 == 3) { if (cxt->scratch_state.state1 == 3) {
// Unlocking // Unlocking
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) { if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
cxt->scratch_state.state1 = 1; cxt->scratch_state.state1 = 1;
cxt->scratch_state.state7 = 0;
} }
} else { } else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons); warnUser(translatedString(Tr->LockingKeysString), buttons);
} }
break; return OperatingMode::Soldering;
}
if (cxt->scratch_state.state7 != 0) {
// show locked until timer is up
if (xTaskGetTickCount() >= cxt->scratch_state.state7) {
cxt->scratch_state.state7 = 0;
} else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
return OperatingMode::Soldering;
}
}
switch (buttons) {
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.state7 = xTaskGetTickCount() + TICKS_SECOND;
warnUser(translatedString(Tr->WarningKeysLockedString), buttons); warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
break; break;
} }