From 7665dff58b53789dd5c8dc3308154a050faacccb Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Fri, 9 Nov 2018 01:15:07 -0500 Subject: [PATCH] No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools (#12375) --- Marlin/src/module/tool_change.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index cdaf4294eb..1d255a88fb 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -498,11 +498,7 @@ inline void invalid_extruder_error(const uint8_t e) { * previous tool out of the way and the new tool into place. */ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool no_move/*=false*/) { - #if EXTRUDERS < 2 - - return invalid_extruder_error(tmp_extruder); - - #elif ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1 + #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1 if (tmp_extruder >= MIXING_VIRTUAL_TOOLS) return invalid_extruder_error(tmp_extruder); @@ -511,6 +507,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n UNUSED(fr_mm_s); UNUSED(no_move); + #elif EXTRUDERS < 2 + + if (tmp_extruder) invalid_extruder_error(tmp_extruder); + return; + #else #if DISABLED(MIXING_EXTRUDER)