Skip to content

Commit

Permalink
fix toolchange
Browse files Browse the repository at this point in the history
  • Loading branch information
studiodyne committed Dec 4, 2023
1 parent bd6eb83 commit 86593f6
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions Marlin/src/module/tool_change.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
if (!too_cold(active_extruder)) {
destination = current_position; // Remember the old position

const bool ok = TERN1(TOOLCHANGE_PARK, all_axes_homed() && toolchange_settings.enable_park);
const bool ok = TERN0(TOOLCHANGE_PARK, all_axes_homed() && toolchange_settings.enable_park);

#if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
// Store and stop fan. Restored on any exit.
Expand Down Expand Up @@ -1080,7 +1080,20 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
}
#endif

extruder_cutting_recover(destination.e); // Cutting recover
// Clone previous position
extruder_cutting_recover(current_position.e = destination.e); // Cutting recover

// Retract if previously retracted
#if ENABLED(FWRETRACT)
if (fwretract.retracted[active_extruder])
unscaled_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
#endif

// If resume_position is negative
if (current_position.e < 0) unscaled_e_move(current_position.e, MMM_TO_MMS(toolchange_settings.retract_speed));

planner.synchronize();
planner.set_e_position_mm(current_position.e); // Extruder primed and ready
}
}

Expand Down Expand Up @@ -1597,6 +1610,9 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
unscaled_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
#endif

// If resume_position is negative
if (resume_current_e < 0) unscaled_e_move(resume_current_e, MMM_TO_MMS(toolchange_settings.retract_speed));

// If no available extruder
if (EXTRUDERS < 2 || active_extruder >= EXTRUDERS - 2 || active_extruder == migration.last)
migration.automode = false;
Expand Down

0 comments on commit 86593f6

Please sign in to comment.