3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 05:48:43 +00:00
Code Issues Releases Wiki Activity

Revert "[2.0.x]Idex and bl touch fixes" (#11407)

Browse Source 
* Revert "[2.0.x] bltouch home refinements (#11397)"

This reverts commit 74900f7a70.

* Revert "[2.0.x]Idex and bl touch fixes (#11395)"

This reverts commit 6dafb90c01.
This commit is contained in:
Roxy-3D 2018-07-28 23:14:46 -05:00 committed by GitHub
parent 74900f7a70
commit 16432376ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/module/tool_change.cpp
View File

@ -377,7 +377,8 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#endif #endif
} }
// Save current position to destination, for use later
set_destination_from_current();
#if HAS_LEVELING #if HAS_LEVELING
// Set current position to the physical position // 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 #endif
#if ENABLED(DUAL_X_CARRIAGE) #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 dualx_tool_change(tmp_extruder, no_move); // Can modify no_move
#else // !DUAL_X_CARRIAGE #else // !DUAL_X_CARRIAGE
// Save current position to destination, for use later
set_destination_from_current();
#if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder #if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder
parking_extruder_tool_change(tmp_extruder, no_move); parking_extruder_tool_change(tmp_extruder, no_move);
#endif #endif