From bc85a41059f07ce2281b13f69c5e1c95b7ea51da Mon Sep 17 00:00:00 2001
From: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Date: Sat, 6 Aug 2022 19:42:20 +0300
Subject: [PATCH] Fix xflash flashing

---
 Firmware/Marlin_main.cpp | 10 ++++------
 Firmware/mmu2.cpp        |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 2e086a52b..923595f84 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -1059,12 +1059,6 @@ void setup()
 	fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream
 	stdout = uartout;
 
-	if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED))
-    {
-        MMU2::mmu2.Start();
-    }
-
-
 #ifdef XFLASH
     bool xflash_success = xflash_init();
 	uint8_t optiboot_status = 1;
@@ -1122,6 +1116,10 @@ void setup()
 	SERIAL_ECHO_START;
 	puts_P(PSTR(" " FW_VERSION_FULL));
 
+	if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED)) {
+		MMU2::mmu2.Start();
+	}
+
 	//SERIAL_ECHOPAIR("Active sheet before:", static_cast<unsigned long int>(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))));
 
 #ifdef DEBUG_SEC_LANG
diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp
index 9b10de9a1..149773782 100644
--- a/Firmware/mmu2.cpp
+++ b/Firmware/mmu2.cpp
@@ -113,9 +113,7 @@ MMU2::MMU2()
     , unloadFilamentStarted(false)
     , loadingToNozzle(false)
     , inAutoRetry(false)
-{
-    ResetRetryAttempts();
-}
+{}
 
 void MMU2::Start() {
 #ifdef MMU_HWRESET
@@ -135,6 +133,8 @@ void MMU2::Start() {
 
     // start the communication
     logic.Start();
+
+    ResetRetryAttempts();
 }
 
 void MMU2::Stop() {