Skip to content

No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools #12375

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

Merged
thinkyhead merged 2 commits into from
Nov 9, 2018
Merged

No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools #12375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ff97d
Prevent error thrown by octoprint when calling T0 on connection with …
InsanityAutomation Nov 9, 2018
7987e1a
Don't break MIXING_EXTRUDER in tool_change
thinkyhead Nov 9, 2018
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
11 changes: 6 additions & 5 deletions Marlin/src/module/tool_change.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,11 +498,7 @@ inline void invalid_extruder_error(const uint8_t e) {
* previous tool out of the way and the new tool into place.
*/
void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool no_move/*=false*/) {
#if EXTRUDERS < 2

return invalid_extruder_error(tmp_extruder);

#elif ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
#if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1

if (tmp_extruder >= MIXING_VIRTUAL_TOOLS)
return invalid_extruder_error(tmp_extruder);
Expand All @@ -511,6 +507,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
UNUSED(fr_mm_s);
UNUSED(no_move);

#elif EXTRUDERS < 2

if (tmp_extruder) invalid_extruder_error(tmp_extruder);
return;

#else

#if DISABLED(MIXING_EXTRUDER)
Expand Down