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

Implement custom delay/millis for EXTENSIBLE_UI (#12188)

Browse Source
This commit is contained in:
Marcio Teixeira
2018-10-22 18:37:48 -06:00
committed by Scott Lahteine
parent 3a3ab3391f
commit fc31da1114
4 changed files with 116 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/Marlin.cpp
View File

@ -617,9 +617,7 @@ void kill(PGM_P const lcd_msg/*=NULL*/) {
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
#if ENABLED(EXTENSIBLE_UI)
UI::onPrinterKilled(lcd_msg ? lcd_msg : PSTR(MSG_KILLED));
#elif ENABLED(ULTRA_LCD)
#if ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI)
kill_screen(lcd_msg ? lcd_msg : PSTR(MSG_KILLED));
#else
UNUSED(lcd_msg);