Browse Source

Convert LIGHTWEIGHT_UI to CPP

Scott Lahteine 5 years ago
parent
commit
37ff663b02

Marlin/src/lcd/dogm/status_screen_lite_ST7920.h → Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp View File

@@ -36,9 +36,28 @@
36 36
  *    bar, so updates are sporadic.
37 37
  */
38 38
 
39
+//
40
+// status_screen_lite_ST7920.cpp
41
+// Lightweight Status Screen for Graphical Display
42
+//
43
+
44
+#include "../../inc/MarlinConfigPre.h"
45
+
46
+#if ENABLED(LIGHTWEIGHT_UI)
47
+
39 48
 #include "status_screen_lite_ST7920_class.h"
40 49
 
50
+#include "../ultralcd.h"
51
+#include "../fontutils.h"
52
+#include "../lcdprint.h"
41 53
 #include "../../libs/duration_t.h"
54
+#include "../../module/motion.h"
55
+#include "../../module/printcounter.h"
56
+#include "../../module/temperature.h"
57
+
58
+#if ENABLED(SDSUPPORT)
59
+  #include "../../sd/cardreader.h"
60
+#endif
42 61
 
43 62
 #define BUFFER_WIDTH   256
44 63
 #define BUFFER_HEIGHT  32
@@ -971,3 +990,5 @@ void lcd_in_status(const bool inStatus) {
971 990
   else
972 991
     ST7920_Lite_Status_Screen::on_exit();
973 992
 }
993
+
994
+#endif // LIGHTWEIGHT_UI

+ 1
- 5
Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h View File

@@ -13,9 +13,7 @@
13 13
  * FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
14 14
  *
15 15
  */
16
-
17
-#ifndef STATUS_SCREEN_LITE_ST7920_CLASS_H
18
-#define STATUS_SCREEN_LITE_ST7920_CLASS_H
16
+#pragma once
19 17
 
20 18
 #include "../../core/macros.h"
21 19
 #include "../../libs/duration_t.h"
@@ -107,5 +105,3 @@ class ST7920_Lite_Status_Screen {
107 105
     static void on_exit();
108 106
     static void clear_text_buffer();
109 107
 };
110
-
111
-#endif // STATUS_SCREEN_LITE_ST7920_CLASS_H

+ 1
- 1
Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp View File

@@ -182,7 +182,7 @@ void lcd_setFont(const MarlinFont font_nr) {
182 182
 #endif // SHOW_BOOTSCREEN
183 183
 
184 184
 #if ENABLED(LIGHTWEIGHT_UI)
185
-  #include "status_screen_lite_ST7920.h"
185
+  #include "status_screen_lite_ST7920_class.h"
186 186
 #endif
187 187
 
188 188
 // Initialize or re-initialize the LCD

Loading…
Cancel
Save