MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Convert LIGHTWEIGHT_UI to CPP

Browse Source
This commit is contained in:
Scott Lahteine 2018-10-28 00:27:29 -05:00
parent a964f098b3
commit 37ff663b02
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,9 +36,28 @@
* bar, so updates are sporadic. * 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 "status_screen_lite_ST7920_class.h"
#include "../ultralcd.h"
#include "../fontutils.h"
#include "../lcdprint.h"
#include "../../libs/duration_t.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_WIDTH 256
#define BUFFER_HEIGHT 32 #define BUFFER_HEIGHT 32
@ -971,3 +990,5 @@ void lcd_in_status(const bool inStatus) {
else else
ST7920_Lite_Status_Screen::on_exit(); ST7920_Lite_Status_Screen::on_exit();
} }
#endif // LIGHTWEIGHT_UI

6
Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h
View File

@ -13,9 +13,7 @@
* FOR A PARTICULAR PURPOSE. See the GNU GPL for more details. * FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
* *
*/ */
#pragma once
#ifndef STATUS_SCREEN_LITE_ST7920_CLASS_H
#define STATUS_SCREEN_LITE_ST7920_CLASS_H
#include "../../core/macros.h" #include "../../core/macros.h"
#include "../../libs/duration_t.h" #include "../../libs/duration_t.h"
@ -107,5 +105,3 @@ class ST7920_Lite_Status_Screen {
static void on_exit(); static void on_exit();
static void clear_text_buffer(); static void clear_text_buffer();
}; };
#endif // STATUS_SCREEN_LITE_ST7920_CLASS_H

2
Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp
View File

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