From 33c37d587d1c437241f9e18c122161d4dafe6759 Mon Sep 17 00:00:00 2001 From: Roxy-3D Date: Sat, 28 Jul 2018 23:14:41 -0500 Subject: [PATCH] Revert "[1.1.x] idex and bl touch fix" (#11406) * Revert "[1.1.x] bltouch home refinements (#11398)" This reverts commit 30839a6ba66bfb3fbce1141b1ff50a896cdcae4d. * Revert "[1.1.x] idex and bl touch fix (#11392)" This reverts commit e1bef0ea797ee311296240d8f9a1af1ea65e16c5. --- Marlin/Marlin_main.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 72a34dc17..20bf5fbeb 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -12017,7 +12017,9 @@ 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 const bool leveling_was_active = planner.leveling_active; @@ -12025,15 +12027,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #endif #if ENABLED(DUAL_X_CARRIAGE) - // Save current position to destination, for use later - 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 - set_destination_from_current(); + #if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder parking_extruder_tool_change(tmp_extruder, no_move); #endif