From 0bbe7f6714b1a9ff2eaaed8b50dacbb248fe293a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 17 Sep 2024 15:06:59 +0200 Subject: [PATCH 1/3] Fix MMU unload issue after a fan check issue has been solved --- Firmware/fancheck.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp index bec0d56dc4..2f73313a33 100755 --- a/Firmware/fancheck.cpp +++ b/Firmware/fancheck.cpp @@ -149,7 +149,7 @@ void checkFanSpeed() lcd_reset_alert_level(); //for another fan speed error lcd_setstatuspgm(MSG_WELCOME); // Reset the status line message to visually show the error is gone } - if (fans_check_enabled && (fan_check_error == EFCE_OK)) + if (fans_check_enabled && (fan_check_error != EFCE_REPORTED)) { for (uint8_t fan = 0; fan < 2; fan++) { From 2c5c7da784e8b5ccecbfa08ebbad1797b2c254a6 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 17 Sep 2024 15:08:30 +0200 Subject: [PATCH 2/3] Enable Tune menu during fan check issues, user can then disable the fan check if needed. Send //action:cancel when LCD Stop print is selected. --- Firmware/ultralcd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1ac744c11a..e150f51130 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5216,7 +5216,7 @@ static void lcd_main_menu() MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 if (!printer_recovering()) { - if ( moves_planned() || printer_active()) { + if ( moves_planned() || printer_active() || fan_check_error == EFCE_REPORTED) { MENU_ITEM_SUBMENU_P(_T(MSG_TUNE), lcd_tune_menu); } else if (!Stopped) { MENU_ITEM_SUBMENU_P(_T(MSG_PREHEAT), lcd_preheat_menu); @@ -5719,9 +5719,8 @@ void print_stop(bool interactive, bool unconditional_stop) // Reset the sd status card.sdprinting = false; card.closefile(); - } else { - SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_CANCEL); } + SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_CANCEL); #ifdef MESH_BED_LEVELING mbl.active = false; From c134884834beac907b26817f8ebb2e54fa63b725 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 23 Sep 2024 07:00:17 +0200 Subject: [PATCH 3/3] Add `#ifdef FANCHECK` thanks @gudnimg --- Firmware/ultralcd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e150f51130..f9a2b4fcce 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5216,7 +5216,11 @@ static void lcd_main_menu() MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 if (!printer_recovering()) { - if ( moves_planned() || printer_active() || fan_check_error == EFCE_REPORTED) { + if ( moves_planned() || printer_active() +#ifdef FANCHECK + || fan_check_error == EFCE_REPORTED +#endif //End FANCHECK + ) { MENU_ITEM_SUBMENU_P(_T(MSG_TUNE), lcd_tune_menu); } else if (!Stopped) { MENU_ITEM_SUBMENU_P(_T(MSG_PREHEAT), lcd_preheat_menu);