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

Toolchange improvements #16979

Merged
merged 2 commits into from
Feb 26, 2020
Merged

Toolchange improvements #16979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a5cb57
Toolchange tweaks
InsanityAutomation Feb 26, 2020
83c104a
Update tool_change.cpp
thinkyhead Feb 26, 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
9 changes: 5 additions & 4 deletions Marlin/src/module/tool_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
#endif
#endif

#if ENABLED(MAGNETIC_PARKING_EXTRUDER) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
#include "../gcode/gcode.h" // for dwell()
#if ENABLED(MAGNETIC_PARKING_EXTRUDER) || defined(EVENT_GCODE_AFTER_TOOLCHANGE) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
#include "../gcode/gcode.h"
#endif

#if ANY(SWITCHING_EXTRUDER, SWITCHING_NOZZLE, SWITCHING_TOOLHEAD)
Expand Down Expand Up @@ -861,7 +861,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
}
#endif // TOOLCHANGE_FILAMENT_SWAP

#if HAS_LEVELING
#if HAS_LEVELING && DISABLED(SINGLENOZZLE)
// Set current position to the physical position
TEMPORARY_BED_LEVELING_STATE(false);
#endif
Expand Down Expand Up @@ -1068,7 +1068,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#endif

#ifdef EVENT_GCODE_AFTER_TOOLCHANGE
gcode.process_subcommands_now_P(EVENT_GCODE_AFTER_TOOLCHANGE);
if (!no_move)
gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE));
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#endif

SERIAL_ECHO_START();
Expand Down