3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-07-24 15:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Optimize target_extruder, ignore T with mixing (#12432)

Browse source 
* Optimize target_extruder, ignore T with mixing
* Give G-code Tn parity with tool_change
This commit is contained in:
Scott Lahteine 2018-11-14 17:33:04 -06:00 • committed by GitHub
parent 5e586a6b39
commit d2bb53702a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 150 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Marlin/src/module/tool_change.cpp
View file

@ -500,8 +500,8 @@ inline void invalid_extruder_error(const uint8_t e) {
void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool no_move/*=false*/) {
#if ENABLED(MIXING_EXTRUDER)
UNUSED(fr_mm_s);
UNUSED(no_move);
UNUSED(fr_mm_s); UNUSED(no_move);
if (tmp_extruder >= MIXING_VIRTUAL_TOOLS)
return invalid_extruder_error(tmp_extruder);
@ -512,12 +512,12 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#elif EXTRUDERS < 2
UNUSED(fr_mm_s);
UNUSED(no_move);
UNUSED(fr_mm_s); UNUSED(no_move);
if (tmp_extruder) invalid_extruder_error(tmp_extruder);
return;
#else
#else // EXTRUDERS > 1
planner.synchronize();
@ -751,5 +751,5 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, int(active_extruder));
#endif // EXTRUDERS <= 1 && (!MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1)
#endif // EXTRUDERS > 1
}