🔧 Condensing park commands to one Gcode location

ultimachine · Feb 27, 2024 · ad5182b · ad5182b
1 parent d8df325
commit ad5182b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
   }