From 428b67db316ceb11e41152270a97844c897feb39 Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Fri, 11 Feb 2022 21:04:47 +0000
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20More=20Nozzle=20Park=20move=20optio?=
=?UTF-8?q?ns=20(#23158)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
Marlin/Configuration.h | 3 +--
Marlin/src/inc/SanityCheck.h | 4 ++++
Marlin/src/libs/nozzle.cpp | 17 ++++++++++++-----
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d3c36ad4850..752fd1370a8 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1913,8 +1913,7 @@
#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
- //#define NOZZLE_PARK_X_ONLY // X move only is required to park
- //#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
+ #define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 38c2866ca1f..8f6843eee98 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -609,6 +609,10 @@
#error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
#elif defined(DEFAULT_LCD_BRIGHTNESS)
#error "DEFAULT_LCD_BRIGHTNESS is now LCD_BRIGHTNESS_DEFAULT."
+#elif defined(NOZZLE_PARK_X_ONLY)
+ #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 1."
+#elif defined(NOZZLE_PARK_Y_ONLY)
+ #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2."
#endif
constexpr float arm[] = AXIS_RELATIVE_MODES;
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index e277216ab4e..5cd2014d7f8 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -254,11 +254,18 @@ Nozzle nozzle;
break;
}
- do_blocking_move_to_xy(
- TERN(NOZZLE_PARK_Y_ONLY, current_position, park).x,
- TERN(NOZZLE_PARK_X_ONLY, current_position, park).y,
- fr_xy
- );
+ #ifndef NOZZLE_PARK_MOVE
+ #define NOZZLE_PARK_MOVE 0
+ #endif
+ switch (NOZZLE_PARK_MOVE) {
+ case 0: do_blocking_move_to_xy(park, fr_xy); break;
+ case 1: do_blocking_move_to_x(park.x, fr_xy); break;
+ case 2: do_blocking_move_to_y(park.y, fr_xy); break;
+ case 3: do_blocking_move_to_x(park.x, fr_xy);
+ do_blocking_move_to_y(park.y, fr_xy); break;
+ case 4: do_blocking_move_to_y(park.y, fr_xy);
+ do_blocking_move_to_x(park.x, fr_xy); break;
+ }
report_current_position();
}