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

Extensible user interface API (#11193)

Browse Source
This commit is contained in:
Marcio Teixeira
2018-10-08 14:44:05 -06:00
committed by Scott Lahteine
parent ee253991d4
commit 906a24fa81
88 changed files with 1571 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/Marlin.cpp
View File

@ -152,6 +152,10 @@
#include "feature/controllerfan.h"
#endif
#if ENABLED(EXTENSIBLE_UI)
#include "lcd/extensible_ui/ui_api.h"
#endif
bool Running = true;
/**
@ -609,7 +613,9 @@ void kill(PGM_P lcd_msg) {
thermalManager.disable_all_heaters();
disable_all_steppers();
#if ENABLED(ULTRA_LCD)
#if ENABLED(EXTENSIBLE_UI)
UI::onPrinterKilled(lcd_msg);
#elif ENABLED(ULTRA_LCD)
kill_screen(lcd_msg);
#else
UNUSED(lcd_msg);
@ -958,7 +964,7 @@ void loop() {
card.checkautostart();
#endif
#if ENABLED(SDSUPPORT) && ENABLED(ULTIPANEL)
#if ENABLED(SDSUPPORT) && (ENABLED(ULTIPANEL) || ENABLED(EXTENSIBLE_UI))
if (abort_sd_printing) {
abort_sd_printing = false;
card.stopSDPrint(
@ -978,7 +984,7 @@ void loop() {
card.removeJobRecoveryFile();
#endif
}
#endif // SDSUPPORT && ULTIPANEL
#endif // SDSUPPORT && (ENABLED(ULTIPANEL) || ENABLED(EXTENSIBLE_UI))
if (commands_in_queue < BUFSIZE) get_available_commands();
advance_command_queue();