Skip to content
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

Jump to bottom

Prevent Z misaligments on tool change #16518

Merged
merged 6 commits into from
Jan 10, 2020
Merged

Prevent Z misaligments on tool change #16518

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65acdd5
Fix 16429
GMagician Jan 4, 2020
5bf9348
Fix z misalignment when z_max reached
GMagician Jan 9, 2020
d61ec72
Limit z_max check only when limits are avaiable
GMagician Jan 9, 2020
b41f77e
Preserve current Z on abort. Fix missing semicolon.
thinkyhead Jan 10, 2020
ed14e46
Update tool_change.cpp
thinkyhead Jan 10, 2020
ec91afd
Use hard limits when no soft limits exist
thinkyhead Jan 10, 2020
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
21 changes: 15 additions & 6 deletions Marlin/src/module/tool_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,11 +929,20 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#elif ENABLED(SWITCHING_NOZZLE) && !SWITCHING_NOZZLE_TWO_SERVOS // Switching Nozzle (single servo)
// Raise by a configured distance to avoid workpiece, except with
// SWITCHING_NOZZLE_TWO_SERVOS, as both nozzles will lift instead.
current_position.z += _MAX(-diff.z, 0.0) + toolchange_settings.z_raise;
#if HAS_SOFTWARE_ENDSTOPS
NOMORE(current_position.z, soft_endstop.max.z);
#endif
if (!no_move) fast_line_to_current(Z_AXIS);
if (!no_move) {
#if HAS_SOFTWARE_ENDSTOPS
const float maxz = _MIN(soft_endstop.max.z, Z_MAX_POS);
#else
constexpr float maxz = Z_MAX_POS;
#endif

// Check if Z has space to compensate at least z_offset, and if not, just abort now
const float newz = current_position.z + _MAX(-diff.z, 0.0);
if (newz > maxz) return;

current_position.z = _MIN(newz + toolchange_settings.z_raise, maxz);
fast_line_to_current(Z_AXIS);
}
move_nozzle_servo(new_tool);
#endif

Expand All @@ -942,7 +951,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#endif

// The newly-selected extruder XYZ is actually at...
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Offset Tool XY by { ", diff.x, ", ", diff.y, ", ", diff.z, " }");
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Offset Tool XYZ by { ", diff.x, ", ", diff.y, ", ", diff.z, " }");
current_position += diff;

// Tell the planner the new "current position"
Expand Down