Merge c6ec5f1356 into f3e0dfd481
This commit is contained in:
commit
553d54d6e8
|
|
@ -386,7 +386,7 @@ bool MMU2::tool_change(uint8_t slot) {
|
||||||
!marlin_printingIsActive()) {
|
!marlin_printingIsActive()) {
|
||||||
// If Tcodes are used manually through the serial
|
// If Tcodes are used manually through the serial
|
||||||
// we need to unload manually as well -- but only if FINDA detects filament
|
// we need to unload manually as well -- but only if FINDA detects filament
|
||||||
unload();
|
UnloadInner();
|
||||||
}
|
}
|
||||||
|
|
||||||
ReportingRAII rep(CommandInProgress::ToolChange);
|
ReportingRAII rep(CommandInProgress::ToolChange);
|
||||||
|
|
@ -482,10 +482,6 @@ void MMU2::UnloadInner() {
|
||||||
IncrementMMUFails();
|
IncrementMMUFails();
|
||||||
}
|
}
|
||||||
MakeSound(Confirm);
|
MakeSound(Confirm);
|
||||||
|
|
||||||
// no active tool
|
|
||||||
SetCurrentTool(MMU2_NO_TOOL);
|
|
||||||
tool_change_extruder = MMU2_NO_TOOL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MMU2::unload() {
|
bool MMU2::unload() {
|
||||||
|
|
@ -500,6 +496,10 @@ bool MMU2::unload() {
|
||||||
UnloadInner();
|
UnloadInner();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// no active tool
|
||||||
|
SetCurrentTool(MMU2_NO_TOOL);
|
||||||
|
tool_change_extruder = MMU2_NO_TOOL;
|
||||||
|
|
||||||
ScreenUpdateEnable();
|
ScreenUpdateEnable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue