From 5d4218f7e65f8153b48d101a0e04fbb850115005 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 8 Nov 2024 08:00:24 +0100 Subject: [PATCH] Revert "Fix MMU tool change" This reverts commit be4104a47c75377c17ea98d39067508dc1dd782d. Split PR --- Firmware/mmu2.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 76cb042d49..55405637b2 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -386,7 +386,7 @@ bool MMU2::tool_change(uint8_t slot) { !marlin_printingIsActive()) { // If Tcodes are used manually through the serial // we need to unload manually as well -- but only if FINDA detects filament - UnloadInner(); + unload(); } ReportingRAII rep(CommandInProgress::ToolChange); @@ -482,6 +482,10 @@ void MMU2::UnloadInner() { IncrementMMUFails(); } MakeSound(Confirm); + + // no active tool + SetCurrentTool(MMU2_NO_TOOL); + tool_change_extruder = MMU2_NO_TOOL; } bool MMU2::unload() { @@ -496,10 +500,6 @@ bool MMU2::unload() { UnloadInner(); } - // no active tool - SetCurrentTool(MMU2_NO_TOOL); - tool_change_extruder = MMU2_NO_TOOL; - ScreenUpdateEnable(); return true; }