bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix "paused" message and M125 called by M25 (#12551)

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-28 19:28:31 -06:00
committed by GitHub
parent 95d154a91f
commit 03ef2d6c82
8 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -45,12 +45,7 @@
#if ENABLED(POWER_LOSS_RECOVERY)
if (recovery.enabled) recovery.save(true, false);
#endif
card.pauseSDPrint();
print_job_timer.pause();
#if ENABLED(PARK_HEAD_ON_PAUSE)
enqueue_and_echo_commands_P(PSTR("M125"));
#endif
ui.reset_status();
enqueue_and_echo_commands_P(PSTR("M25"));
}
void lcd_sdcard_resume() {

8
Marlin/src/lcd/ultralcd.cpp
View File

@ -26,9 +26,7 @@
#if HAS_SPI_LCD || ENABLED(MALYAN_LCD) || ENABLED(EXTENSIBLE_UI)
#include "ultralcd.h"
MarlinUI ui;
#if ENABLED(SDSUPPORT)
#include "../sd/cardreader.h"
#endif
#include "../sd/cardreader.h"
#if ENABLED(EXTENSIBLE_UI)
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
#endif
@ -1243,7 +1241,7 @@ void MarlinUI::update() {
static const char printing[] PROGMEM = MSG_PRINTING;
static const char welcome[] PROGMEM = WELCOME_MSG;
PGM_P msg;
if (print_job_timer.isPaused())
if (!IS_SD_PRINTING() && print_job_timer.isPaused())
msg = paused;
#if ENABLED(SDSUPPORT)
else if (IS_SD_PRINTING())
@ -1257,4 +1255,4 @@ void MarlinUI::update() {
set_status_P(msg, -1);
}
#endif
#endif // HAS_SPI_LCD || EXTENSIBLE_UI