From 16dfcfeb9a0a54943e0f1fb988bc04d6867b49c7 Mon Sep 17 00:00:00 2001
From: gudnimg <gudni.m.g@gmail.com>
Date: Sun, 14 Apr 2024 12:07:56 +0000
Subject: [PATCH] MMU: Improve unload handling when print is aborted

- Don't allow re-heating the nozzle or the MMU to unload the filament if the print was aborted by a temperature error
- Allow MMU to unload filament if there is no temperature error, and there is no fan error when Fan check is enabled
- When Fan check is disabled, the MMU may unload if there is no temperature error

Change in memory:
Flash: +14 bytes
SRAM: 0 bytes

PFW-1557
---
 Firmware/ultralcd.cpp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index fae9f306fa..9e1128f245 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5716,23 +5716,26 @@ void lcd_print_stop_finish()
 
         // restore the auto hotend state
         hotendDefaultAutoFanState();
-    }
 
-    if (MMU2::mmu2.Enabled() && MMU2::mmu2.FindaDetectsFilament())
-    {
-        // The print was aborted while when the nozzle was cold:
-        //     1. in a paused state                      => a partial backup in RAM is always available
-        //     2. after a recoverable thermal/fan error had paused the print => only extruder temperature is saved to RAM
-        if (printingIsPaused())
-        {
-            // Restore temperature saved in ram after pausing print
-            restore_extruder_temperature_from_ram();
-        }
+        if (MMU2::mmu2.Enabled() && MMU2::mmu2.FindaDetectsFilament()
+#ifdef FANCHECK
+            && fan_check_error != EFCE_REPORTED
+#endif //FANCHECK
+        ) {
+            // The print was aborted while when the nozzle was cold:
+            //     1. in a paused state                      => a partial backup in RAM is always available
+            //     2. after a recoverable thermal/fan error had paused the print => only extruder temperature is saved to RAM
+            if (printingIsPaused())
+            {
+                // Restore temperature saved in ram after pausing print
+                restore_extruder_temperature_from_ram();
+            }
 
-        // If the pause state was cleared previously or the target temperature is 0°C in the case
-        // of an unconditional stop. In that scenario we do not want to unload.
-        if (target_temperature[0] >= extrude_min_temp) {
-            MMU2::mmu2.unload(); // M702
+            // If the pause state was cleared previously or the target temperature is 0°C in the case
+            // of an unconditional stop. In that scenario we do not want to unload.
+            if (target_temperature[0] >= extrude_min_temp) {
+                MMU2::mmu2.unload(); // M702
+            }
         }
     }