CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Toolchange touchup (#17395)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
InsanityAutomation 2020-04-03 20:17:05 -04:00 committed by GitHub
parent ed0799d653
commit bc01d8d023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/tool_change.cpp
View File

@ -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