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

Merge pull request #1956 from neon12345/dev

Browse Source 
Possible fix for lock/unlock toggle loop
This commit is contained in:
discip
2024-08-01 03:36:58 +02:00
committed by GitHub
parent 56d8082e7d 6a2f2dc344
commit 2bce5b710e
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,25 +2,35 @@
#include "OperatingModes.h" #include "OperatingModes.h"
#include "SolderingCommon.h" #include "SolderingCommon.h"
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
// State 1 = button locking // State 1 = button locking (0:unlocked+released, 1:unlocked, 2:locked, 3:locked+released)
// State 2 = boost mode // State 2 = boost mode
// State 3 = buzzer timer // State 3 = buzzer timer
OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) { OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) {
if (cxt->scratch_state.state1 == 1) { if (cxt->scratch_state.state1 >= 2) {
// Buttons are currently locked // Buttons are currently locked
if (buttons == BUTTON_F_LONG) { switch (buttons) {
case BUTTON_F_LONG:
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) { if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) {
cxt->scratch_state.state2 = 1; cxt->scratch_state.state2 = 1;
} }
} else if (buttons == BUTTON_BOTH_LONG) { break;
// Unlocking case BUTTON_BOTH_LONG:
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) { if (cxt->scratch_state.state1 == 3) {
cxt->scratch_state.state1 = 0; // Unlocking
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
cxt->scratch_state.state1 = 1;
}
} else {
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
} }
} else if (buttons != BUTTON_NONE) { break;
// Do nothing and display a lock warning case BUTTON_NONE:
cxt->scratch_state.state1 = 3;
break;
default: // Do nothing and display a lock warning
warnUser(translatedString(Tr->WarningKeysLockedString), buttons); warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
break;
} }
return OperatingMode::Soldering; return OperatingMode::Soldering;
} }
@@ -28,6 +38,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
switch (buttons) { switch (buttons) {
case BUTTON_NONE: case BUTTON_NONE:
cxt->scratch_state.state2 = 0; cxt->scratch_state.state2 = 0;
cxt->scratch_state.state1 = 0;
break; break;
case BUTTON_BOTH: case BUTTON_BOTH:
/*Fall through*/ /*Fall through*/
@@ -45,9 +56,16 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
cxt->transitionMode = TransitionAnimation::Left; cxt->transitionMode = TransitionAnimation::Left;
return OperatingMode::TemperatureAdjust; return OperatingMode::TemperatureAdjust;
case BUTTON_BOTH_LONG: case BUTTON_BOTH_LONG:
if (getSettingValue(SettingsOptions::LockingMode) && warnUser(translatedString(Tr->LockingKeysString), buttons)) { if (getSettingValue(SettingsOptions::LockingMode)) {
// Lock buttons // Lock buttons
cxt->scratch_state.state1 = 1; if (cxt->scratch_state.state1 == 0) {
if (warnUser(translatedString(Tr->LockingKeysString), buttons)) {
cxt->scratch_state.state1 = 2;
}
} else {
// FIXME should be WarningKeysUnlockedString
warnUser(translatedString(Tr->UnlockingKeysString), buttons);
}
} }
break; break;
default: default: