|
@ -116,17 +116,14 @@ void GcodeSuite::M600() { |
|
|
|
|
|
|
|
|
xyz_pos_t park_point NOZZLE_PARK_POINT; |
|
|
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
|
|
|
// Move XY axes to filament change position or given position
|
|
|
LINEAR_AXIS_CODE( |
|
|
LINEAR_AXIS_CODE( |
|
|
if (parser.seenval('X')) park_point.x = parser.linearval('X'), |
|
|
if (parser.seenval('X')) park_point.x = parser.linearval('X'), |
|
|
if (parser.seenval('Y')) park_point.y = parser.linearval('Y'), |
|
|
if (parser.seenval('Y')) park_point.y = parser.linearval('Y'), |
|
|
NOOP, |
|
|
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(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME), |
|
|
if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_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(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME) |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
#if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA) |
|
|
#if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA) |
|
|