andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Make nomove=false for toolchange on filament swap (#12739)

pull/1/head
InsanityAutomation 6 years ago
committed by Scott Lahteine
parent
14ddda285c
commit
530ef5846f
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/gcode/feature/pause/M600.cpp
  2. 10
      Marlin/src/gcode/feature/pause/M701_M702.cpp

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

@ -88,7 +88,7 @@ void GcodeSuite::M600() {
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
&& dual_x_carriage_mode != DXC_DUPLICATION_MODE && dual_x_carriage_mode != DXC_SCALED_DUPLICATION_MODE && dual_x_carriage_mode != DXC_DUPLICATION_MODE && dual_x_carriage_mode != DXC_SCALED_DUPLICATION_MODE
#endif #endif
) tool_change(target_extruder, 0, true); ) tool_change(target_extruder, 0, false);
#endif #endif
// Initial retract before move to filament change position // Initial retract before move to filament change position
@ -137,7 +137,7 @@ void GcodeSuite::M600() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
// Restore toolhead if it was changed // Restore toolhead if it was changed
if (active_extruder_before_filament_change != active_extruder) if (active_extruder_before_filament_change != active_extruder)
tool_change(active_extruder_before_filament_change, 0, true); tool_change(active_extruder_before_filament_change, 0, false);
#endif #endif
} }

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

@ -71,7 +71,7 @@ void GcodeSuite::M701() {
// Change toolhead if specified // Change toolhead if specified
uint8_t active_extruder_before_filament_change = active_extruder; uint8_t active_extruder_before_filament_change = active_extruder;
if (active_extruder != target_extruder) if (active_extruder != target_extruder)
tool_change(target_extruder, 0, true); tool_change(target_extruder, 0, false);
#endif #endif
// Lift Z axis // Lift Z axis
@ -96,7 +96,7 @@ void GcodeSuite::M701() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
// Restore toolhead if it was changed // Restore toolhead if it was changed
if (active_extruder_before_filament_change != active_extruder) if (active_extruder_before_filament_change != active_extruder)
tool_change(active_extruder_before_filament_change, 0, true); tool_change(active_extruder_before_filament_change, 0, false);
#endif #endif
// Show status screen // Show status screen
@ -138,7 +138,7 @@ void GcodeSuite::M702() {
// Change toolhead if specified // Change toolhead if specified
uint8_t active_extruder_before_filament_change = active_extruder; uint8_t active_extruder_before_filament_change = active_extruder;
if (active_extruder != target_extruder) if (active_extruder != target_extruder)
tool_change(target_extruder, 0, true); tool_change(target_extruder, 0, false);
#endif #endif
// Lift Z axis // Lift Z axis
@ -149,7 +149,7 @@ void GcodeSuite::M702() {
#if EXTRUDERS > 1 && ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS) #if EXTRUDERS > 1 && ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
if (!parser.seenval('T')) { if (!parser.seenval('T')) {
HOTEND_LOOP() { HOTEND_LOOP() {
if (e != active_extruder) tool_change(e, 0, true); if (e != active_extruder) tool_change(e, 0, false);
unload_filament(-fc_settings[e].unload_length, true, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT); unload_filament(-fc_settings[e].unload_length, true, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT);
} }
} }
@ -170,7 +170,7 @@ void GcodeSuite::M702() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
// Restore toolhead if it was changed // Restore toolhead if it was changed
if (active_extruder_before_filament_change != active_extruder) if (active_extruder_before_filament_change != active_extruder)
tool_change(active_extruder_before_filament_change, 0, true); tool_change(active_extruder_before_filament_change, 0, false);
#endif #endif
// Show status screen // Show status screen

Write Preview
Loading…
Cancel
Save