From 3766aadd9943608a87c46634861331a53a718000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 12 Aug 2023 13:11:36 +0000 Subject: [PATCH] PFW-1530 rename isErrorScreenSleeping to TuneMenuEntered --- Firmware/mmu2.cpp | 2 +- Firmware/mmu2_reporting.cpp | 2 +- Firmware/mmu2_reporting.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 0ada3f71e..79c631b0b 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -819,7 +819,7 @@ bool MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) { // the E may have some more moves to finish - wait for them ResumeHotendTemp(); ResumeUnpark(); // We can now travel back to the tower or wherever we were when we saved. - if (!isErrorScreenSleeping()) + if (!TuneMenuEntered()) { // If the error screen is sleeping (running 'Tune' menu) // then don't reset retry attempts because we this will trigger diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 97c9eedf6..2b4f40b58 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -227,7 +227,7 @@ bool isErrorScreenRunning() { return is_mmu_error_monitor_active; } -bool isErrorScreenSleeping() { +bool TuneMenuEntered() { return putErrorScreenToSleep; } diff --git a/Firmware/mmu2_reporting.h b/Firmware/mmu2_reporting.h index 55c07c2f3..89a2765bd 100644 --- a/Firmware/mmu2_reporting.h +++ b/Firmware/mmu2_reporting.h @@ -28,7 +28,7 @@ bool isErrorScreenRunning(); /// Return true if the error screen is sleeping in the background /// Error screen sleeps when the firmware is rendering complementary /// UI to resolve the error screen, for example tuning Idler Stallguard Threshold -bool isErrorScreenSleeping(); +bool TuneMenuEntered(); /// @brief Called when the MMU or MK3S sends operation error (even repeatedly). /// Render MMU error screen on the LCD. This must be non-blocking