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

Update Soldering.cpp

Browse Source 
revert last commit
This commit is contained in:
neon12345
2024-08-01 05:29:53 +02:00
committed by GitHub
parent 34db06ab9c
commit c0ba6eb30d
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
// State 3 = buzzer timer
OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) {
if (cxt->scratch_state.state1 & (2|3)) {
if (cxt->scratch_state.state1 >= 2) {
// Buttons are currently locked
switch (buttons) {
case BUTTON_F_LONG:
@@ -16,21 +16,17 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
}
break;
case BUTTON_BOTH_LONG:
if ((cxt->scratch_state.state1 & (2|3)) == 3) {
if (cxt->scratch_state.state1 == 3) {
// Unlocking
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
// cxt->scratch_state.state1 &= ~3;
// cxt->scratch_state.state1 |= 1;
cxt->scratch_state.state1 &= ~2;
cxt->scratch_state.state1 = 1;
}
} else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
}
break;
case BUTTON_NONE:
//cxt->scratch_state.state1 &= ~2;
//cxt->scratch_state.state1 |= 3;
cxt->scratch_state.state1 |= 3;
cxt->scratch_state.state1 = 3;
break;
default: // Do nothing and display a lock warning
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
@@ -42,7 +38,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
switch (buttons) {
case BUTTON_NONE:
cxt->scratch_state.state2 = 0;
cxt->scratch_state.state1 &= ~1;
cxt->scratch_state.state1 = 0;
break;
case BUTTON_BOTH:
/*Fall through*/
@@ -62,9 +58,9 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
case BUTTON_BOTH_LONG:
if (getSettingValue(SettingsOptions::LockingMode)) {
// Lock buttons
if ((cxt->scratch_state.state1 & 1) == 0) {
if (cxt->scratch_state.state1 == 0) {
if (warnUser(translatedString(Tr->LockingKeysString), buttons)) {
cxt->scratch_state.state1 |= 2;
cxt->scratch_state.state1 = 2;
}
} else {
// FIXME should be WarningKeysUnlockedString