Keith Bennett
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
31 additions and
13 deletions
-
Marlin/Configuration_adv.h
-
Marlin/src/lcd/tft/ui_320x240.cpp
-
Marlin/src/lcd/tft/ui_320x240.h
-
Marlin/src/lcd/tft/ui_480x320.cpp
-
Marlin/src/lcd/tft/ui_480x320.h
|
|
@ -1140,6 +1140,9 @@ |
|
|
|
|
|
|
|
#if ENABLED(SHOW_BOOTSCREEN) |
|
|
|
#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 |
|
|
|
|
|
|
|
// Scroll a longer status message into view
|
|
|
@ -1450,7 +1453,6 @@ |
|
|
|
//#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_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.
|
|
|
|
|
|
|
|
// Frivolous Game Options
|
|
|
|
|
|
@ -92,10 +92,20 @@ void MarlinUI::clear_lcd() { |
|
|
|
tft.queue.reset(); |
|
|
|
|
|
|
|
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 |
|
|
|
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 |
|
|
|
|
|
|
|
tft.queue.sync(); |
|
|
|
|
|
@ -44,7 +44,7 @@ void menu_item(const uint8_t row, bool sel = false); |
|
|
|
#define ABSOLUTE_ZERO -273.15 |
|
|
|
|
|
|
|
const tImage Images[imgCount] = { |
|
|
|
MarlinLogo320x240x16, |
|
|
|
TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo320x240x16), |
|
|
|
HotEnd_64x64x4, |
|
|
|
Bed_64x64x4, |
|
|
|
Bed_Heated_64x64x4, |
|
|
|
|
|
@ -90,18 +90,24 @@ void MarlinUI::clear_lcd() { |
|
|
|
} |
|
|
|
|
|
|
|
#if ENABLED(SHOW_BOOTSCREEN) |
|
|
|
#undef BOOTSCREEN_TIMEOUT |
|
|
|
#define BOOTSCREEN_TIMEOUT 5000 |
|
|
|
|
|
|
|
void MarlinUI::show_bootscreen() { |
|
|
|
tft.queue.reset(); |
|
|
|
|
|
|
|
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.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 |
|
|
|
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 |
|
|
|
|
|
|
|
tft.queue.sync(); |
|
|
|
|
|
@ -44,7 +44,7 @@ void menu_item(const uint8_t row, bool sel = false); |
|
|
|
#define ABSOLUTE_ZERO -273.15 |
|
|
|
|
|
|
|
const tImage Images[imgCount] = { |
|
|
|
MarlinLogo195x59x16, |
|
|
|
TERN(BOOT_MARLIN_LOGO_SMALL, MarlinLogo195x59x16, MarlinLogo480x320x16), |
|
|
|
HotEnd_64x64x4, |
|
|
|
Bed_64x64x4, |
|
|
|
Bed_Heated_64x64x4, |
|
|
|