From 37ff663b0242b3db8f46d13ca26c6ee4be40a833 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 28 Oct 2018 00:27:29 -0500 Subject: [PATCH] Convert LIGHTWEIGHT_UI to CPP --- ...ST7920.h => status_screen_lite_ST7920.cpp} | 21 +++++++++++++++++++ .../dogm/status_screen_lite_ST7920_class.h | 6 +----- Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) rename Marlin/src/lcd/dogm/{status_screen_lite_ST7920.h => status_screen_lite_ST7920.cpp} (98%) diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp similarity index 98% rename from Marlin/src/lcd/dogm/status_screen_lite_ST7920.h rename to Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp index 9bbcdc3842..73851ecefb 100644 --- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h +++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp @@ -36,9 +36,28 @@ * bar, so updates are sporadic. */ +// +// status_screen_lite_ST7920.cpp +// Lightweight Status Screen for Graphical Display +// + +#include "../../inc/MarlinConfigPre.h" + +#if ENABLED(LIGHTWEIGHT_UI) + #include "status_screen_lite_ST7920_class.h" +#include "../ultralcd.h" +#include "../fontutils.h" +#include "../lcdprint.h" #include "../../libs/duration_t.h" +#include "../../module/motion.h" +#include "../../module/printcounter.h" +#include "../../module/temperature.h" + +#if ENABLED(SDSUPPORT) + #include "../../sd/cardreader.h" +#endif #define BUFFER_WIDTH 256 #define BUFFER_HEIGHT 32 @@ -971,3 +990,5 @@ void lcd_in_status(const bool inStatus) { else ST7920_Lite_Status_Screen::on_exit(); } + +#endif // LIGHTWEIGHT_UI diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h b/Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h index 3bbbd31d6a..323d951c36 100644 --- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h +++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h @@ -13,9 +13,7 @@ * FOR A PARTICULAR PURPOSE. See the GNU GPL for more details. * */ - -#ifndef STATUS_SCREEN_LITE_ST7920_CLASS_H -#define STATUS_SCREEN_LITE_ST7920_CLASS_H +#pragma once #include "../../core/macros.h" #include "../../libs/duration_t.h" @@ -107,5 +105,3 @@ class ST7920_Lite_Status_Screen { static void on_exit(); static void clear_text_buffer(); }; - -#endif // STATUS_SCREEN_LITE_ST7920_CLASS_H diff --git a/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp index 2e415c8e9e..c6547c4655 100644 --- a/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp +++ b/Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp @@ -182,7 +182,7 @@ void lcd_setFont(const MarlinFont font_nr) { #endif // SHOW_BOOTSCREEN #if ENABLED(LIGHTWEIGHT_UI) - #include "status_screen_lite_ST7920.h" + #include "status_screen_lite_ST7920_class.h" #endif // Initialize or re-initialize the LCD