thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

G-code queue singleton, front injection (#14236)

Browse Source
This commit is contained in:
Scott Lahteine
2019-06-19 00:00:19 -05:00
committed by GitHub
parent 75aeb41ab7
commit 4c872a01f2
32 changed files with 337 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,7 +441,7 @@ bool MarlinUI::get_blink() {
#endif // HAS_LCD_MENU
if (!homed && RRK(EN_KEYPAD_F1)) enqueue_and_echo_commands_P(PSTR("G28"));
if (!homed && RRK(EN_KEYPAD_F1)) queue.inject_P(PSTR("G28"));
return true;
}
@@ -1461,9 +1461,9 @@ void MarlinUI::update() {
#if HAS_SPI_LCD
lcd_pause_show_message(PAUSE_MESSAGE_PAUSING, PAUSE_MODE_PAUSE_PRINT); // Show message immediately to let user know about pause in progress
#endif
enqueue_and_echo_commands_front_P(PSTR("M25 P\nM24"));
queue.inject_P(PSTR("M25 P\nM24"));
#elif ENABLED(SDSUPPORT)
enqueue_and_echo_commands_P(PSTR("M25"));
queue.inject_P(PSTR("M25"));
#elif defined(ACTION_ON_PAUSE)
host_action_pause();
#endif
@@ -1475,7 +1475,7 @@ void MarlinUI::update() {
wait_for_heatup = wait_for_user = false;
#endif
#if ENABLED(SDSUPPORT)
if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
if (card.isPaused()) queue.inject_P(PSTR("M24"));
#endif
#ifdef ACTION_ON_RESUME
host_action_resume();