|
@ -1054,8 +1054,6 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { |
|
|
first_tool_is_primed = true; |
|
|
first_tool_is_primed = true; |
|
|
TERN_(TOOLCHANGE_FS_INIT_BEFORE_SWAP, toolchange_extruder_ready[old_tool] = true); // Primed and initialized
|
|
|
TERN_(TOOLCHANGE_FS_INIT_BEFORE_SWAP, toolchange_extruder_ready[old_tool] = true); // Primed and initialized
|
|
|
} |
|
|
} |
|
|
#else |
|
|
|
|
|
constexpr bool first_tool_is_primed = true; |
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
if (new_tool != old_tool || TERN0(PARKING_EXTRUDER, extruder_parked)) { // PARKING_EXTRUDER may need to attach old_tool when homing
|
|
|
if (new_tool != old_tool || TERN0(PARKING_EXTRUDER, extruder_parked)) { // PARKING_EXTRUDER may need to attach old_tool when homing
|
|
@ -1092,7 +1090,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
// For first new tool, change without unloading the old. 'Just prime/init the new'
|
|
|
// For first new tool, change without unloading the old. 'Just prime/init the new'
|
|
|
if (first_tool_is_primed) |
|
|
if (TERN1(TOOLCHANGE_FS_PRIME_FIRST_USED, first_tool_is_primed)) |
|
|
unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); |
|
|
unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); |
|
|
TERN_(TOOLCHANGE_FS_PRIME_FIRST_USED, first_tool_is_primed = true); // The first new tool will be primed by toolchanging
|
|
|
TERN_(TOOLCHANGE_FS_PRIME_FIRST_USED, first_tool_is_primed = true); // The first new tool will be primed by toolchanging
|
|
|
} |
|
|
} |
|
|