Skip to content

Commit 9773160

Browse files
committed
🔧 Character display has boot screen
1 parent f246e0d commit 9773160

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

Marlin/Configuration_adv.h

+13-12
Original file line numberDiff line numberDiff line change
@@ -1537,23 +1537,24 @@
15371537
* We encourage you to take advantage of this new feature and we also
15381538
* respectfully request that you retain the unmodified Marlin boot screen.
15391539
*/
1540-
#if ANY(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE, IS_DWIN_MARLINUI)
1541-
#define SHOW_BOOTSCREEN // Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
1542-
#if ENABLED(SHOW_BOOTSCREEN)
1543-
#define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s)
1544-
#if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
1545-
#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
1546-
#endif
1547-
//#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
1540+
#define SHOW_BOOTSCREEN // Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
1541+
#if ENABLED(SHOW_BOOTSCREEN)
1542+
#define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s)
1543+
#if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
1544+
#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
15481545
#endif
15491546
#if HAS_MARLINUI_U8GLIB
1550-
#if ENABLED(SHOW_BOOTSCREEN)
1551-
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash.
1552-
#endif
1553-
//#define CUSTOM_STATUS_SCREEN_IMAGE // Show the bitmap in Marlin/_Statusscreen.h on the status screen.
1547+
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash.
1548+
#endif
1549+
#if EITHER(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE)
1550+
//#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
15541551
#endif
15551552
#endif
15561553

1554+
#if HAS_MARLINUI_U8GLIB
1555+
//#define CUSTOM_STATUS_SCREEN_IMAGE // Show the bitmap in Marlin/_Statusscreen.h on the status screen.
1556+
#endif
1557+
15571558
//#define SOUND_MENU_ITEM // Add a mute option to the LCD menu
15581559
#define SOUND_ON_DEFAULT // Buzzer/speaker default enabled state
15591560

Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
3232
#if ENABLED(TOUCH_UI_PORTRAIT)
33-
#include "../theme/bootscreen_logo_portrait.h"
33+
#include "../theme/_bootscreen_portrait.h"
3434
#else
3535
#include "../theme/_bootscreen_landscape.h"
3636
#endif

0 commit comments

Comments
 (0)