SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Show print time with PRINTER_EVENT_LEDS

Browse source
This commit is contained in:
Scott Lahteine 2020-02-08 23:10:01 -06:00
parent 38873596ec
commit 0ce83dee95
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/gcode/lcd/M0_M1.cpp
View file

@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() {
if (has_message) if (has_message)
ui.set_status(args, true); ui.set_status(args, true);
else { else if (!parser.seenval('Q')) {
LCD_MESSAGEPGM(MSG_USERWAIT); LCD_MESSAGEPGM(MSG_USERWAIT);
#if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0 #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
ui.reset_progress_bar_timeout(); ui.reset_progress_bar_timeout();
@ -101,12 +101,8 @@ void GcodeSuite::M0_M1() {
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), CONTINUE_STR); host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), CONTINUE_STR);
#endif #endif
if (ms > 0) { if (ms > 0) ms += millis(); // wait until this time for a click
ms += millis(); // wait until this time for a click while (wait_for_user && (ms > 0 || PENDING(millis(), ms))) idle();
while (PENDING(millis(), ms) && wait_for_user) idle();
}
else
while (wait_for_user) idle();
#if HAS_LEDS_OFF_FLAG #if HAS_LEDS_OFF_FLAG
printerEventLEDs.onResumeAfterWait(); printerEventLEDs.onResumeAfterWait();

5
Marlin/src/gcode/queue.cpp
View file

@ -163,8 +163,7 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true; if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
if (_enqueue(cmd)) { if (_enqueue(cmd)) {
SERIAL_ECHO_START(); SERIAL_ECHO_MSG(MSG_ENQUEUEING, cmd, "\"");
SERIAL_ECHOLNPAIR(MSG_ENQUEUEING, cmd, "\"");
return true; return true;
} }
return false; return false;
@ -517,7 +516,7 @@ void GCodeQueue::get_serial_commands() {
#if ENABLED(PRINTER_EVENT_LEDS) #if ENABLED(PRINTER_EVENT_LEDS)
printerEventLEDs.onPrintCompleted(); printerEventLEDs.onPrintCompleted();
#if HAS_RESUME_CONTINUE #if HAS_RESUME_CONTINUE
inject_P(PSTR("M0 S" inject_P(PSTR("M0 Q S"
#if HAS_LCD_MENU #if HAS_LCD_MENU
"1800" "1800"
#else #else