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

Merge pull request #4471 from gudnimg/issue-4470 

MMU: Set PAUSED_FOR_USER state on MMU error screen
This commit is contained in:
3d-gussner 2023-10-31 08:36:53 +01:00 committed by GitHub
parent 3ffe7bf406 287e340117
commit fca93b00e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/mmu2_reporting.cpp
View File

@ -248,6 +248,7 @@ void ReportErrorHook(CommandInProgress /*cip*/, ErrorCode ec, uint8_t /*es*/) {
switch ((uint8_t)ReportErrorHookState) { switch ((uint8_t)ReportErrorHookState) {
case (uint8_t)ReportErrorHookStates::RENDER_ERROR_SCREEN: case (uint8_t)ReportErrorHookStates::RENDER_ERROR_SCREEN:
KEEPALIVE_STATE(PAUSED_FOR_USER);
ReportErrorHookStaticRender(ei); ReportErrorHookStaticRender(ei);
ReportErrorHookState = ReportErrorHookStates::MONITOR_SELECTION; ReportErrorHookState = ReportErrorHookStates::MONITOR_SELECTION;
[[fallthrough]]; [[fallthrough]];
@ -270,6 +271,7 @@ void ReportErrorHook(CommandInProgress /*cip*/, ErrorCode ec, uint8_t /*es*/) {
sound_wait_for_user_reset(); sound_wait_for_user_reset();
// Reset the state in case a new error is reported // Reset the state in case a new error is reported
is_mmu_error_monitor_active = false; is_mmu_error_monitor_active = false;
KEEPALIVE_STATE(IN_HANDLER);
ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN; ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN;
break; break;
default: default:
@ -283,6 +285,7 @@ void ReportErrorHook(CommandInProgress /*cip*/, ErrorCode ec, uint8_t /*es*/) {
sound_wait_for_user_reset(); sound_wait_for_user_reset();
// Reset the state in case a new error is reported // Reset the state in case a new error is reported
is_mmu_error_monitor_active = false; is_mmu_error_monitor_active = false;
KEEPALIVE_STATE(IN_HANDLER);
ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN; ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN;
break; break;
default: default: