bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Misc. issue review patches

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-22 13:21:26 -05:00
committed by Scott Lahteine
parent e0c439fe91
commit 7f4a49cc44
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/feature/pause/M600.cpp
View File

@ -106,7 +106,7 @@ void GcodeSuite::M600() {
// Change toolhead if specified
const uint8_t active_extruder_before_filament_change = active_extruder;
if (active_extruder != target_extruder && TERN1(DUAL_X_CARRIAGE, !idex_is_duplicating()))
tool_change(target_extruder, false);
tool_change(target_extruder);
#endif
// Initial retract before move to filament change position
@ -159,7 +159,7 @@ void GcodeSuite::M600() {
#if HAS_MULTI_EXTRUDER
// Restore toolhead if it was changed
if (active_extruder_before_filament_change != active_extruder)
tool_change(active_extruder_before_filament_change, false);
tool_change(active_extruder_before_filament_change);
#endif
TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool

10
Marlin/src/gcode/feature/pause/M701_M702.cpp
View File

@ -85,7 +85,7 @@ void GcodeSuite::M701() {
// Change toolhead if specified
uint8_t active_extruder_before_filament_change = active_extruder;
if (active_extruder != target_extruder)
tool_change(target_extruder, false);
tool_change(target_extruder);
#endif
auto move_z_by = [](const_float_t zdist) {
@ -124,7 +124,7 @@ void GcodeSuite::M701() {
#if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
// Restore toolhead if it was changed
if (active_extruder_before_filament_change != active_extruder)
tool_change(active_extruder_before_filament_change, false);
tool_change(active_extruder_before_filament_change);
#endif
TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
@ -188,7 +188,7 @@ void GcodeSuite::M702() {
// Change toolhead if specified
uint8_t active_extruder_before_filament_change = active_extruder;
if (active_extruder != target_extruder)
tool_change(target_extruder, false);
tool_change(target_extruder);
#endif
// Lift Z axis
@ -202,7 +202,7 @@ void GcodeSuite::M702() {
#if BOTH(HAS_MULTI_EXTRUDER, FILAMENT_UNLOAD_ALL_EXTRUDERS)
if (!parser.seenval('T')) {
HOTEND_LOOP() {
if (e != active_extruder) tool_change(e, false);
if (e != active_extruder) tool_change(e);
unload_filament(-fc_settings[e].unload_length, true, PAUSE_MODE_UNLOAD_FILAMENT);
}
}
@ -228,7 +228,7 @@ void GcodeSuite::M702() {
#if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
// Restore toolhead if it was changed
if (active_extruder_before_filament_change != active_extruder)
tool_change(active_extruder_before_filament_change, false);
tool_change(active_extruder_before_filament_change);
#endif
TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool