Merge pull request #4773 from 3d-gussner/MK3_fix_unload

PFW-1561 Fix MMU unload issue
prusa3d · Sep 23, 2024 · aa4de7a · aa4de7a
2 parents ab5c7ac + 402b9ed
commit aa4de7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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++)
         {

diff --git 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()) {
+        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);
@@ -5719,9 +5723,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;