From ad5182b4430dcdec4a6e9b80ae68d52e7ae25649 Mon Sep 17 00:00:00 2001
From: bkahl <bkahl@lulzbot.com>
Date: Tue, 27 Feb 2024 10:36:58 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Condensing=20park=20commands=20t?=
 =?UTF-8?q?o=20one=20Gcode=20location?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generic/base_numeric_adjustment_screen.cpp                  | 2 +-
 .../extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp  | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp   | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp    | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
index ea96bbeed97b..8640a9d0620a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
@@ -383,7 +383,7 @@ void BaseNumericAdjustmentScreen::onEntry() {
 bool BaseNumericAdjustmentScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:           GOTO_PREVIOUS(); return true;
-    case 100:           SpinnerDialogBox::enqueueAndWait(F("G28O\nG0 X100 Y283 Z200 F3000"));
+    case 100:         SpinnerDialogBox::enqueueAndWait(F(PARKING_COMMAND_GCODE)); break;
     case 240 ... 245: mydata.increment = tag; break;
     default:          return current_screen.onTouchHeld(tag);
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
index 47930202efc4..4e4cd763c50f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
@@ -367,7 +367,7 @@ bool ChangeFilamentScreen::onTouchEnd(uint8_t tag) {
               injectCommands(F("M117 Print Resumed")); resumePrint(); GOTO_SCREEN(StatusScreen); break;
             }
             else{
-              injectCommands(F("G28O\nG0 X100 Y283 Z200 F3000"));
+              injectCommands(F(PARKING_COMMAND_GCODE)); break;
             }
   }
   return true;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
index 455215ded79f..3bdbcc7cf9bc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -164,7 +164,7 @@ bool CustomUserMenus::onTouchEnd(uint8_t tag) {
     #endif
 
     case 1: GOTO_PREVIOUS(); break;
-    case 20: injectCommands(F("G28O\nG0 X100 Y283 Z200 F3000"));
+    case 20: injectCommands(F(PARKING_COMMAND_GCODE)); break;
     default: return false;
   }
   return true;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index 305ae9826f6f..e4a3bd78df1b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -120,7 +120,7 @@ bool BaseMoveAxisScreen::onTouchHeld(const uint8_t tag) {
       #endif
     #endif
     case 23: SpinnerDialogBox::enqueueAndWait(F("G28")); break;
-    case 25:           SpinnerDialogBox::enqueueAndWait(F("G28O\nG0 X100 Y283 Z200 F3000"));
+    case 25: injectCommands(F(PARKING_COMMAND_GCODE)); break;
     default:
       return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
index a8e008cd303f..f5873d16126a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
@@ -133,7 +133,7 @@ bool TemperatureScreen::onTouchHeld(uint8_t tag) {
     case 32: injectCommands_P(PSTR(PREHEAT_2_COMMAND)); GOTO_SCREEN(StatusScreen); break;
     case 33: injectCommands_P(PSTR(PREHEAT_3_COMMAND)); GOTO_SCREEN(StatusScreen); break;
     case 34: injectCommands_P(PSTR(PREHEAT_4_COMMAND)); GOTO_SCREEN(StatusScreen); break;
-    case 35: injectCommands(F("G28O\nG0 X100 Y283 Z200 F3000"));
+    case 35: injectCommands(F(PARKING_COMMAND_GCODE)); break;
     default:
       return false;
   }