Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Roxy-3D merged 2 commits into from
Jul 29, 2018
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8f75ec
Revert "[2.0.x] bltouch home refinements (#11397)"
Roxy-3D Jul 29, 2018
6280436
Revert "[2.0.x]Idex and bl touch fixes (#11395)"
Roxy-3D Jul 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Marlin/src/module/tool_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down