From 7bc9d15514f1c9b55dfb0cb5a0a5a13666f96a33 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 14 Jan 2022 03:43:14 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Followup=20to=20extra=20axes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/gcode/feature/pause/M600.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp index edb06aa947..1679c90687 100644 --- a/Marlin/src/gcode/feature/pause/M600.cpp +++ b/Marlin/src/gcode/feature/pause/M600.cpp @@ -116,17 +116,14 @@ void GcodeSuite::M600() { xyz_pos_t park_point NOZZLE_PARK_POINT; - // Lift Z axis first - if (parser.seenval('Z')) park_point.z = parser.linearval('Z'); - // Move XY axes to filament change position or given position LINEAR_AXIS_CODE( if (parser.seenval('X')) park_point.x = parser.linearval('X'), if (parser.seenval('Y')) park_point.y = parser.linearval('Y'), - NOOP, - if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME); - if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME); - if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME); + if (parser.seenval('Z')) park_point.z = parser.linearval('Z'), // Lift Z axis + if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME), + if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME), + if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME) ); #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)