From 16432376ab9ac694e6ac38d21dfcf001e91cbd27 Mon Sep 17 00:00:00 2001 From: Roxy-3D Date: Sat, 28 Jul 2018 23:14:46 -0500 Subject: [PATCH] Revert "[2.0.x]Idex and bl touch fixes" (#11407) * Revert "[2.0.x] bltouch home refinements (#11397)" This reverts commit 74900f7a70f339071fd1e03176260f61f668d4cd. * Revert "[2.0.x]Idex and bl touch fixes (#11395)" This reverts commit 6dafb90c0143d615430138f213a0fd232610119a. --- Marlin/src/module/tool_change.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index bd8264b70d..35c52cf7ae 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -377,7 +377,8 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #endif } - + // Save current position to destination, for use later + set_destination_from_current(); #if HAS_LEVELING // Set current position to the physical position @@ -386,15 +387,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #endif #if ENABLED(DUAL_X_CARRIAGE) - if(current_position[X_AXIS] != x_home_pos(active_extruder)) - set_destination_from_current(); - else - no_move = true; + dualx_tool_change(tmp_extruder, no_move); // Can modify no_move #else // !DUAL_X_CARRIAGE - // Save current position to destination, for use later - set_destination_from_current(); + #if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder parking_extruder_tool_change(tmp_extruder, no_move); #endif