From 6284eaf17d5dab7ce193b6be7ba1402a00b46355 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sat, 12 Jan 2019 23:36:12 -0500 Subject: [PATCH] Make M25 work as well --- Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp | 10 ++++++---- Marlin/src/lcd/menu/menu_main.cpp | 6 +----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp index f1cdaa1078..c54b56763c 100644 --- a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp +++ b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp @@ -114,13 +114,15 @@ void GcodeSuite::M24() { * M25: Pause SD Print */ void GcodeSuite::M25() { + + // Set initial pause flag to prevent more commands from landing in the queue while we try to pause + #if ENABLED(SDSUPPORT) + if (IS_SD_PRINTING()) { card.pauseSDPrint(); } + #endif + #if ENABLED(PARK_HEAD_ON_PAUSE) M125(); #else - #if ENABLED(SDSUPPORT) - if (IS_SD_PRINTING()) card.pauseSDPrint(); - #endif - print_job_timer.pause(); ui.reset_status(); diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 6c45b3990c..639403ead1 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -43,12 +43,8 @@ void lcd_pause() { if (recovery.enabled) recovery.save(true, false); #endif - // Set initial pause flag to prevent more commands from landing in the queue while we try to pause - #if ENABLED(SDSUPPORT) - if (IS_SD_PRINTING()) { card.pauseSDPrint(); } - #endif - #if ENABLED(PARK_HEAD_ON_PAUSE) + lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, active_extruder); enqueue_and_echo_commands_P(PSTR("M25 P; \n M24")); #elif ENABLED(SDSUPPORT) enqueue_and_echo_commands_P(PSTR("M25"));