From 6eb2767dd2ef262f61928e6c2e683d5fc496f331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= <gudni.m.g@gmail.com>
Date: Sun, 26 Jun 2022 12:20:29 +0000
Subject: [PATCH] PFW-1334 Distinguish between a retry unload and U0 unload

U0 unload uses the ramming sequence, while the retry unload does not because the MMU starts unloading much sooner
---
 Firmware/mmu2.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp
index 8d023a810..450730b9d 100644
--- a/Firmware/mmu2.cpp
+++ b/Firmware/mmu2.cpp
@@ -783,6 +783,12 @@ void MMU2::OnMMUProgressMsg(ProgressCode pc){
         // Act accordingly - one-time handling
         switch (pc) {
         case ProgressCode::UnloadingToFinda:
+            if ((CommandInProgress)logic.CommandInProgress() == CommandInProgress::UnloadFilament)
+            {
+                // If MK3S sent U0 command, then the code below is not relevant.
+                break;
+            }
+
             // This is intended to handle Retry option on MMU error screen
             // MMU sends P3 progress code during Query, and if filament is stuck
             // in the gears, the MK3S needs to move e-axis as well.