Make M25 work as well

This commit is contained in:
InsanityAutomation
2019-01-12 23:36:12 -05:00
parent 5094b167d4
commit 6284eaf17d
2 changed files with 7 additions and 9 deletions
@@ -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();
+1 -5
View File
@@ -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"));