From 15e9839344c7741e0a12cec16cf8990021eb4a39 Mon Sep 17 00:00:00 2001 From: Brian Kahl Date: Thu, 16 Sep 2021 09:09:12 -0500 Subject: [PATCH 1/3] Making Clean nozzle command the same for all printers with wipe. --- Marlin/Configuration.h | 2 +- Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp | 2 +- Marlin/src/lcd/menu/menu_motion.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a866d1c94..1b8471549 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2511,7 +2511,7 @@ #endif #if ENABLED(NOZZLE_CLEAN_FEATURE) - #define CLEAN_SCRIPT "M117 Hot end heating...\nM104 S170\nG28 O\nG12" + #define CLEAN_SCRIPT "M117 cleaning Nozzle...\nG28O\nG12\nM77\nM117 Nozzle Clean" // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp index 96650ef7e..9370240e5 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp @@ -106,7 +106,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) { case 1: SaveSettingsDialogBox::promptToSaveSettings(); break; case 2: SpinnerDialogBox::enqueueAndWait_P(F("G28")); break; #if ENABLED(NOZZLE_CLEAN_FEATURE) - case 3: injectCommands_P(PSTR("G28O\nG12\nM77")); GOTO_SCREEN(StatusScreen); break; + case 3: injectCommands_P(PSTR(CLEAN_SCRIPT)); GOTO_SCREEN(StatusScreen); break; #endif case 4: GOTO_SCREEN(MoveAxisScreen); break; case 5: injectCommands_P(PSTR("M84")); break; diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp index 6940b1f7d..b1d81e93f 100644 --- a/Marlin/src/lcd/menu/menu_motion.cpp +++ b/Marlin/src/lcd/menu/menu_motion.cpp @@ -391,7 +391,7 @@ void menu_motion() { // Clean Nozzle // #if defined(NOZZLE_CLEAN_FEATURE) - GCODES_ITEM(MSG_NOZZLE_CLEAN, PSTR("G28O\nM117 cleaning Nozzle\nG12\nM77\nM117 Nozzle Clean")); + GCODES_ITEM(MSG_NOZZLE_CLEAN, PSTR(CLEAN_SCRIPT)); #endif // From f9cc7c40a0caee80c65950422968df94ebbd2a32 Mon Sep 17 00:00:00 2001 From: Brian Kahl Date: Thu, 16 Sep 2021 11:19:09 -0500 Subject: [PATCH 2/3] Adding space inbetween G28 and O to make reading easier. --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1b8471549..21323fd09 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2511,7 +2511,7 @@ #endif #if ENABLED(NOZZLE_CLEAN_FEATURE) - #define CLEAN_SCRIPT "M117 cleaning Nozzle...\nG28O\nG12\nM77\nM117 Nozzle Clean" + #define CLEAN_SCRIPT "M117 cleaning Nozzle...\nG28 O\nG12\nM77\nM117 Nozzle Clean" // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12 From 0d7512e71bb67dc2aefdc6d02877f4c25d440b4b Mon Sep 17 00:00:00 2001 From: Brian Kahl Date: Thu, 16 Sep 2021 13:03:20 -0500 Subject: [PATCH 3/3] Capitalizing correction to nozzle clean feature --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 21323fd09..641d81a5f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2511,7 +2511,7 @@ #endif #if ENABLED(NOZZLE_CLEAN_FEATURE) - #define CLEAN_SCRIPT "M117 cleaning Nozzle...\nG28 O\nG12\nM77\nM117 Nozzle Clean" + #define CLEAN_SCRIPT "M117 Cleaning nozzle...\nG28 O\nG12\nM77\nM117 Nozzle clean" // Default number of pattern repetitions #define NOZZLE_CLEAN_STROKES 12