MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "[1.1.x] idex and bl touch fix" (#11406)

Browse Source 
* 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.
This commit is contained in:
Roxy-3D 2018-07-28 23:14:41 -05:00 committed by GitHub
parent 30839a6ba6
commit 33c37d587d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -12017,7 +12017,9 @@ 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
const bool leveling_was_active = planner.leveling_active; 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 #endif
#if ENABLED(DUAL_X_CARRIAGE) #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 dualx_tool_change(tmp_extruder, no_move); // Can modify no_move
#else // !DUAL_X_CARRIAGE #else // !DUAL_X_CARRIAGE
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