CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small / Large Boot Screen option for TFT_COLOR_UI (#20578)

Browse Source
This commit is contained in:
Keith Bennett 2020-12-27 19:10:53 -08:00 committed by GitHub
parent 91c350e793
commit cfcfc8047a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View File

@ -1140,6 +1140,9 @@
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s) #define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s)
#if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
#endif
#endif #endif
// Scroll a longer status message into view // Scroll a longer status message into view
@ -1450,7 +1453,6 @@
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
//#define STATUS_HEAT_PERCENT // Show heating in a progress bar //#define STATUS_HEAT_PERCENT // Show heating in a progress bar
//#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM. //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
// Frivolous Game Options // Frivolous Game Options

16
Marlin/src/lcd/tft/ui_320x240.cpp
View File

@ -92,10 +92,20 @@ void MarlinUI::clear_lcd() {
tft.queue.reset(); tft.queue.reset();
tft.canvas(0, 0, TFT_WIDTH, TFT_HEIGHT); tft.canvas(0, 0, TFT_WIDTH, TFT_HEIGHT);
tft.add_image(0, 0, imgBootScreen); // MarlinLogo320x240x16 #if ENABLED(BOOT_MARLIN_LOGO_SMALL)
#define BOOT_LOGO_W 195 // MarlinLogo195x59x16
#define BOOT_LOGO_H 59
#define SITE_URL_Y (TFT_HEIGHT - 46)
tft.set_background(COLOR_BACKGROUND);
#else
#define BOOT_LOGO_W 320 // MarlinLogo320x240x16
#define BOOT_LOGO_H 240
#define SITE_URL_Y (TFT_HEIGHT - 52)
#endif
tft.add_image((TFT_WIDTH - BOOT_LOGO_W) / 2, (TFT_HEIGHT - BOOT_LOGO_H) / 2, imgBootScreen);
#ifdef WEBSITE_URL #ifdef WEBSITE_URL
tft.add_text(4, 188, COLOR_WEBSITE_URL, WEBSITE_URL); tft_string.set(WEBSITE_URL);
tft.add_text(tft_string.center(TFT_WIDTH), SITE_URL_Y, COLOR_WEBSITE_URL, tft_string);
#endif #endif
tft.queue.sync(); tft.queue.sync();

2
Marlin/src/lcd/tft/ui_320x240.h
View File

@ -44,7 +44,7 @@ void menu_item(const uint8_t row, bool sel = false);
#define ABSOLUTE_ZERO -273.15 #define ABSOLUTE_ZERO -273.15
const tImage Images[imgCount] = { const tImage Images[imgCount] = {
MarlinLogo320x240x16, TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16),
HotEnd_64x64x4, HotEnd_64x64x4,
Bed_64x64x4, Bed_64x64x4,
Bed_Heated_64x64x4, Bed_Heated_64x64x4,

18
Marlin/src/lcd/tft/ui_480x320.cpp
View File

@ -90,18 +90,24 @@ void MarlinUI::clear_lcd() {
} }
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#undef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 5000
void MarlinUI::show_bootscreen() { void MarlinUI::show_bootscreen() {
tft.queue.reset(); tft.queue.reset();
tft.canvas(0, 0, TFT_WIDTH, TFT_HEIGHT); tft.canvas(0, 0, TFT_WIDTH, TFT_HEIGHT);
#if ENABLED(BOOT_MARLIN_LOGO_SMALL)
#define BOOT_LOGO_W 195 // MarlinLogo195x59x16
#define BOOT_LOGO_H 59
#define SITE_URL_Y (TFT_HEIGHT - 70)
tft.set_background(COLOR_BACKGROUND); tft.set_background(COLOR_BACKGROUND);
tft.add_image(142, 130, imgBootScreen); // MarlinLogo195x59x16 #else
#define BOOT_LOGO_W 480 // MarlinLogo480x320x16
#define BOOT_LOGO_H 320
#define SITE_URL_Y (TFT_HEIGHT - 90)
#endif
tft.add_image((TFT_WIDTH - BOOT_LOGO_W) / 2, (TFT_HEIGHT - BOOT_LOGO_H) / 2, imgBootScreen);
#ifdef WEBSITE_URL #ifdef WEBSITE_URL
tft.add_text(8, 250, COLOR_WEBSITE_URL, WEBSITE_URL); tft_string.set(WEBSITE_URL);
tft.add_text(tft_string.center(TFT_WIDTH), SITE_URL_Y, COLOR_WEBSITE_URL, tft_string);
#endif #endif
tft.queue.sync(); tft.queue.sync();

2
Marlin/src/lcd/tft/ui_480x320.h
View File

@ -44,7 +44,7 @@ void menu_item(const uint8_t row, bool sel = false);
#define ABSOLUTE_ZERO -273.15 #define ABSOLUTE_ZERO -273.15
const tImage Images[imgCount] = { const tImage Images[imgCount] = {
MarlinLogo195x59x16, TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16),
HotEnd_64x64x4, HotEnd_64x64x4,
Bed_64x64x4, Bed_64x64x4,
Bed_Heated_64x64x4, Bed_Heated_64x64x4,