Browse Source
Toolchange touchup (#17395)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
vanilla_fb_2.0.x
InsanityAutomation
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
Marlin/src/module/tool_change.cpp
|
@ -821,7 +821,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { |
|
|
if (new_tool >= EXTRUDERS) |
|
|
if (new_tool >= EXTRUDERS) |
|
|
return invalid_extruder_error(new_tool); |
|
|
return invalid_extruder_error(new_tool); |
|
|
|
|
|
|
|
|
if (!no_move && !all_axes_homed()) { |
|
|
if (!no_move && !homing_needed()) { |
|
|
no_move = true; |
|
|
no_move = true; |
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)"); |
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)"); |
|
|
} |
|
|
} |
|
@ -1073,7 +1073,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#ifdef EVENT_GCODE_AFTER_TOOLCHANGE |
|
|
#ifdef EVENT_GCODE_AFTER_TOOLCHANGE |
|
|
if (!no_move) |
|
|
if (!no_move && TERN1(DUAL_X_CARRIAGE, dual_x_carriage_mode == DXC_AUTO_PARK_MODE)) |
|
|
gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE)); |
|
|
gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE)); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|