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

Added EVENT_GCODE_PARK_Tx #27459

Open
wants to merge 1 commit into
base: bugfix-2.1.x
Choose a base branch
from
+50 −1
Open

Added EVENT_GCODE_PARK_Tx #27459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,10 @@
/**
* Extra G-code to run while executing tool-change commands. Can be used to use an additional
* stepper motor (e.g., I axis in Configuration.h) to drive the tool-changer.
*
*/
//#define EVENT_GCODE_PARK_T0 "G28 A\nG1 A0" // Extra G-code to run before executing tool-change command if T0 was active before the toolchange command
//#define EVENT_GCODE_PARK_T1 "G1 A10" // Extra G-code to run before executing tool-change command if T1 was active before the toolchange command
//#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
//#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10" // Extra G-code to run while executing tool-change command T1
//#define EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN // Always execute above G-code sequences. Use with caution!
Expand Down
48 changes: 47 additions & 1 deletion Marlin/src/module/tool_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,11 +1436,57 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
TERN_(HAS_FANMUX, fanmux_switch(active_extruder));

if (ENABLED(EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN) || !no_move) {
#if ANY(TC_GCODE_USE_GLOBAL_X, TC_GCODE_USE_GLOBAL_Y, TC_GCODE_USE_GLOBAL_Z,\
EVENT_GCODE_PARK_T0, EVENT_GCODE_PARK_T1, EVENT_GCODE_PARK_T2, EVENT_GCODE_PARK_T3,\
EVENT_GCODE_PARK_T4, EVENT_GCODE_PARK_T5, EVENT_GCODE_PARK_T6, EVENT_GCODE_PARK_T7)
xyz_pos_t old_workspace_offset;
#endif

#if ANY(EVENT_GCODE_PARK_T0, EVENT_GCODE_PARK_T1, EVENT_GCODE_PARK_T2, EVENT_GCODE_PARK_T3,\
EVENT_GCODE_PARK_T4, EVENT_GCODE_PARK_T5, EVENT_GCODE_PARK_T6, EVENT_GCODE_PARK_T7)
old_workspace_offset = workspace_offset;
const xyz_pos_t &ho = hotend_offset[new_tool];
TERN_(TC_GCODE_USE_GLOBAL_X, workspace_offset.x -= ho.x);
TERN_(TC_GCODE_USE_GLOBAL_Y, workspace_offset.y -= ho.y);
TERN_(TC_GCODE_USE_GLOBAL_Z, workspace_offset.z -= ho.z);
#endif

switch (old_tool) {
default: break;
#ifdef EVENT_GCODE_PARK_T0
case 0: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T0)); break;
#endif
#ifdef EVENT_GCODE_PARK_T1
case 1: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T1)); break;
#endif
#ifdef EVENT_GCODE_PARK_T2
case 2: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T2)); break;
#endif
#ifdef EVENT_GCODE_PARK_T3
case 3: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T3)); break;
#endif
#ifdef EVENT_GCODE_PARK_T4
case 4: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T4)); break;
#endif
#ifdef EVENT_GCODE_PARK_T5
case 5: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T5)); break;
#endif
#ifdef EVENT_GCODE_PARK_T6
case 6: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T6)); break;
#endif
#ifdef EVENT_GCODE_PARK_T7
case 7: gcode.process_subcommands_now(F(EVENT_GCODE_PARK_T7)); break;
#endif
}

#if ANY(EVENT_GCODE_PARK_T0, EVENT_GCODE_PARK_T1, EVENT_GCODE_PARK_T2, EVENT_GCODE_PARK_T3,\
EVENT_GCODE_PARK_T4, EVENT_GCODE_PARK_T5, EVENT_GCODE_PARK_T6, EVENT_GCODE_PARK_T7)
workspace_offset = old_workspace_offset;
#endif

#if ANY(TC_GCODE_USE_GLOBAL_X, TC_GCODE_USE_GLOBAL_Y, TC_GCODE_USE_GLOBAL_Z)
// G0/G1/G2/G3/G5 moves are relative to the active tool.
// Shift the workspace to make custom moves relative to T0.
xyz_pos_t old_workspace_offset;
if (new_tool > 0) {
old_workspace_offset = workspace_offset;
const xyz_pos_t &he = hotend_offset[new_tool];
Expand Down