Przeglądaj źródła

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

InsanityAutomation 6 lat temu
rodzic
commit
530ef5846f

+ 2
- 2
Marlin/src/gcode/feature/pause/M600.cpp Wyświetl plik

88
       #if ENABLED(DUAL_X_CARRIAGE)
88
       #if ENABLED(DUAL_X_CARRIAGE)
89
         && dual_x_carriage_mode != DXC_DUPLICATION_MODE && dual_x_carriage_mode != DXC_SCALED_DUPLICATION_MODE
89
         && dual_x_carriage_mode != DXC_DUPLICATION_MODE && dual_x_carriage_mode != DXC_SCALED_DUPLICATION_MODE
90
       #endif
90
       #endif
91
-    ) tool_change(target_extruder, 0, true);
91
+    ) tool_change(target_extruder, 0, false);
92
   #endif
92
   #endif
93
 
93
 
94
   // Initial retract before move to filament change position
94
   // Initial retract before move to filament change position
137
   #if EXTRUDERS > 1
137
   #if EXTRUDERS > 1
138
     // Restore toolhead if it was changed
138
     // Restore toolhead if it was changed
139
     if (active_extruder_before_filament_change != active_extruder)
139
     if (active_extruder_before_filament_change != active_extruder)
140
-      tool_change(active_extruder_before_filament_change, 0, true);
140
+      tool_change(active_extruder_before_filament_change, 0, false);
141
   #endif
141
   #endif
142
 }
142
 }
143
 
143
 

+ 5
- 5
Marlin/src/gcode/feature/pause/M701_M702.cpp Wyświetl plik

71
     // Change toolhead if specified
71
     // Change toolhead if specified
72
     uint8_t active_extruder_before_filament_change = active_extruder;
72
     uint8_t active_extruder_before_filament_change = active_extruder;
73
     if (active_extruder != target_extruder)
73
     if (active_extruder != target_extruder)
74
-      tool_change(target_extruder, 0, true);
74
+      tool_change(target_extruder, 0, false);
75
   #endif
75
   #endif
76
 
76
 
77
   // Lift Z axis
77
   // Lift Z axis
96
   #if EXTRUDERS > 1
96
   #if EXTRUDERS > 1
97
     // Restore toolhead if it was changed
97
     // Restore toolhead if it was changed
98
     if (active_extruder_before_filament_change != active_extruder)
98
     if (active_extruder_before_filament_change != active_extruder)
99
-      tool_change(active_extruder_before_filament_change, 0, true);
99
+      tool_change(active_extruder_before_filament_change, 0, false);
100
   #endif
100
   #endif
101
 
101
 
102
   // Show status screen
102
   // Show status screen
138
     // Change toolhead if specified
138
     // Change toolhead if specified
139
     uint8_t active_extruder_before_filament_change = active_extruder;
139
     uint8_t active_extruder_before_filament_change = active_extruder;
140
     if (active_extruder != target_extruder)
140
     if (active_extruder != target_extruder)
141
-      tool_change(target_extruder, 0, true);
141
+      tool_change(target_extruder, 0, false);
142
   #endif
142
   #endif
143
 
143
 
144
   // Lift Z axis
144
   // Lift Z axis
149
   #if EXTRUDERS > 1 && ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
149
   #if EXTRUDERS > 1 && ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
150
     if (!parser.seenval('T')) {
150
     if (!parser.seenval('T')) {
151
       HOTEND_LOOP() {
151
       HOTEND_LOOP() {
152
-        if (e != active_extruder) tool_change(e, 0, true);
152
+        if (e != active_extruder) tool_change(e, 0, false);
153
         unload_filament(-fc_settings[e].unload_length, true, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT);
153
         unload_filament(-fc_settings[e].unload_length, true, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT);
154
       }
154
       }
155
     }
155
     }
170
   #if EXTRUDERS > 1
170
   #if EXTRUDERS > 1
171
     // Restore toolhead if it was changed
171
     // Restore toolhead if it was changed
172
     if (active_extruder_before_filament_change != active_extruder)
172
     if (active_extruder_before_filament_change != active_extruder)
173
-      tool_change(active_extruder_before_filament_change, 0, true);
173
+      tool_change(active_extruder_before_filament_change, 0, false);
174
   #endif
174
   #endif
175
 
175
 
176
   // Show status screen
176
   // Show status screen

Ładowanie…
Anuluj
Zapisz