Consolidate Malyan LCD and ExtUI

This commit is contained in:
Scott Lahteine
2019-05-07 20:32:50 -05:00
parent 6811e2921b
commit 23ec650410
5 changed files with 33 additions and 57 deletions

View File

@@ -23,7 +23,7 @@
#include "../inc/MarlinConfigPre.h"
// These displays all share the MarlinUI class
#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI)
#if HAS_DISPLAY
#include "ultralcd.h"
#include "fontutils.h"
MarlinUI ui;
@@ -1192,7 +1192,7 @@ void MarlinUI::update() {
#endif // HAS_SPI_LCD
#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI)
#if HAS_DISPLAY
#if ENABLED(EXTENSIBLE_UI)
#include "extensible_ui/ui_api.h"
@@ -1376,4 +1376,4 @@ void MarlinUI::update() {
}
#endif
#endif // HAS_SPI_LCD || EXTENSIBLE_UI
#endif // HAS_DISPLAY