Browse Source

🩹 Followup to extra axes

Scott Lahteine 2 years ago
parent
commit
7bc9d15514
1 changed files with 4 additions and 7 deletions
  1. 4
    7
      Marlin/src/gcode/feature/pause/M600.cpp

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

116
 
116
 
117
   xyz_pos_t park_point NOZZLE_PARK_POINT;
117
   xyz_pos_t park_point NOZZLE_PARK_POINT;
118
 
118
 
119
-  // Lift Z axis first
120
-  if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
121
-
122
   // Move XY axes to filament change position or given position
119
   // Move XY axes to filament change position or given position
123
   LINEAR_AXIS_CODE(
120
   LINEAR_AXIS_CODE(
124
     if (parser.seenval('X')) park_point.x = parser.linearval('X'),
121
     if (parser.seenval('X')) park_point.x = parser.linearval('X'),
125
     if (parser.seenval('Y')) park_point.y = parser.linearval('Y'),
122
     if (parser.seenval('Y')) park_point.y = parser.linearval('Y'),
126
-    NOOP,
127
-    if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME);
128
-    if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME);
129
-    if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME);
123
+    if (parser.seenval('Z')) park_point.z = parser.linearval('Z'),    // Lift Z axis
124
+    if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME),
125
+    if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME),
126
+    if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME)
130
   );
127
   );
131
 
128
 
132
   #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)
129
   #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)

Loading…
Cancel
Save