josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmu: remove ResetOnExit 

No change in memory
This commit is contained in:
Guðni Már Gilbert 2023-10-18 23:34:41 +00:00
parent 7b9e707709
commit 62b90fde28
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Firmware/mmu2_error_converter.cpp
View File

@ -186,20 +186,15 @@ const char * PrusaErrorButtonMore(){
return MSG_BTN_MORE; return MSG_BTN_MORE;
} }
struct ResetOnExit {
ResetOnExit() = default;
~ResetOnExit(){
buttonSelectedOperation = ButtonOperations::NoOperation;
}
};
Buttons ButtonPressed(ErrorCode ec) { Buttons ButtonPressed(ErrorCode ec) {
if (buttonSelectedOperation == ButtonOperations::NoOperation) { if (buttonSelectedOperation == ButtonOperations::NoOperation) {
return Buttons::NoButton; // no button return Buttons::NoButton; // no button
} }
ResetOnExit ros; // clear buttonSelectedOperation on exit from this call const auto result = ButtonAvailable(ec);
return ButtonAvailable(ec); buttonSelectedOperation = ButtonOperations::NoOperation; // Reset operation
return result;
} }
Buttons ButtonAvailable(ErrorCode ec) { Buttons ButtonAvailable(ErrorCode ec) {