From 4d4a64828bcfa62dbd19ddee7d449f1191e517a4 Mon Sep 17 00:00:00 2001
From: classicrocker883 <andrewleduc88@yahoo.com>
Date: Sat, 15 Apr 2023 03:25:01 -0400
Subject: [PATCH 1/3] rearrange Marling Logo options
---
Marlin/Configuration_adv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index dd9645900407..decb4dcfbb62 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1531,8 +1531,9 @@
#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)
+ //#define BOOT_MARLIN_LOGO_ANIMATED // Choose either small static logo, large animated logo, or BOTH shows small animated logo
#endif
- //#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
+ #define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
#endif
#if HAS_MARLINUI_U8GLIB
//#define CUSTOM_STATUS_SCREEN_IMAGE // Show the bitmap in Marlin/_Statusscreen.h on the status screen.
@@ -1947,7 +1948,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_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash.
// Frivolous Game Options
//#define MARLIN_BRICKOUT
From 72848d30b33445e1350cffa69afd7d5156ba60e0 Mon Sep 17 00:00:00 2001
From: classicrocker883 <andrewleduc88@yahoo.com>
Date: Sat, 15 Apr 2023 03:28:53 -0400
Subject: [PATCH 2/3] cleanup - add space between
---
ini/stm32f4.ini | 1 +
1 file changed, 1 insertion(+)
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index e9b9a956ded2..7060f95db7a5 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -47,6 +47,7 @@ board = marlin_STM32F407ZGT6
board_build.variant = MARLIN_FLY_F407ZG
board_build.offset = 0x8000
upload_protocol = dfu
+
#
# FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
#
From e3cd40623ab49f5b8d1807898bc4e1a1c1c50def Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Apr 2023 20:47:40 -0500
Subject: [PATCH 3/3] fix glitches
---
Marlin/Configuration_adv.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index decb4dcfbb62..294cc4448795 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1531,11 +1531,13 @@
#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)
- //#define BOOT_MARLIN_LOGO_ANIMATED // Choose either small static logo, large animated logo, or BOTH shows small animated logo
#endif
- #define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
+ //#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
#endif
#if HAS_MARLINUI_U8GLIB
+ #if ENABLED(SHOW_BOOTSCREEN)
+ //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash.
+ #endif
//#define CUSTOM_STATUS_SCREEN_IMAGE // Show the bitmap in Marlin/_Statusscreen.h on the status screen.
#endif
#endif