ソースを参照

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

InsanityAutomation 6年前
コミット
530ef5846f
2個のファイルの変更7行の追加7行の削除
  1. 2
    2
      Marlin/src/gcode/feature/pause/M600.cpp
  2. 5
    5
      Marlin/src/gcode/feature/pause/M701_M702.cpp

+ 2
- 2
Marlin/src/gcode/feature/pause/M600.cpp ファイルの表示

@@ -88,7 +88,7 @@ void GcodeSuite::M600() {
88 88
       #if ENABLED(DUAL_X_CARRIAGE)
89 89
         && dual_x_carriage_mode != DXC_DUPLICATION_MODE && dual_x_carriage_mode != DXC_SCALED_DUPLICATION_MODE
90 90
       #endif
91
-    ) tool_change(target_extruder, 0, true);
91
+    ) tool_change(target_extruder, 0, false);
92 92
   #endif
93 93
 
94 94
   // Initial retract before move to filament change position
@@ -137,7 +137,7 @@ void GcodeSuite::M600() {
137 137
   #if EXTRUDERS > 1
138 138
     // Restore toolhead if it was changed
139 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 141
   #endif
142 142
 }
143 143
 

+ 5
- 5
Marlin/src/gcode/feature/pause/M701_M702.cpp ファイルの表示

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

読み込み中…
キャンセル
保存