Move config option

Author: thinkyhead

Marlin/Configuration.h

@@ -3296,6 +3296,8 @@
   #define TFT_FONT  NOTOSANS
 
   //#define TFT_SHARED_IO   // I/O is shared between TFT display and other devices. Disable async data transfer.
+
+  //#define COMPACT_MARLIN_BOOT_LOGO  // Use compressed data to save Flash space.
 #endif
 
 #if ENABLED(TFT_LVGL_UI)

Marlin/Configuration_adv.h

@@ -1547,9 +1547,6 @@
     #if ANY(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
-    #if ENABLED(TFT_COLOR_UI)
-      //#define BOOT_MARLIN_LOGO_USES_RLE16 // Uses less flash space.
-    #endif
     #if HAS_MARLINUI_U8GLIB
       //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash.
     #endif

Marlin/src/inc/Changes.h

@@ -659,6 +659,8 @@
   #error "Z3_USE_ENDSTOP is obsolete. Instead set Z2_STOP_PIN directly. (e.g., 'Z3_USE_ENDSTOP _ZMAX_' becomes 'Z3_STOP_PIN Z_MAX_PIN')"
 #elif defined(Z4_USE_ENDSTOP)
   #error "Z4_USE_ENDSTOP is obsolete. Instead set Z4_STOP_PIN directly. (e.g., 'Z4_USE_ENDSTOP _ZMAX_' becomes 'Z4_STOP_PIN Z_MAX_PIN')"
+#elif defined(BOOT_MARLIN_LOGO_USES_RLE16)
+  #error "BOOT_MARLIN_LOGO_USES_RLE16 is now COMPACT_MARLIN_BOOT_LOGO."
 #endif
 
 // L64xx stepper drivers have been removed

Marlin/src/lcd/tft/canvas.cpp

@@ -121,7 +121,7 @@ void Canvas::addImage(int16_t x, int16_t y, MarlinImage image, uint16_t *colors)
     return;
   }
 
-  #if ENABLED(BOOT_MARLIN_LOGO_USES_RLE16)
+  #if ENABLED(COMPACT_MARLIN_BOOT_LOGO)
     // RLE16 HIGHCOLOR - 16 bits per pixel
     if (color_mode == RLE16) {
       uint8_t *bytedata = (uint8_t *)images[image].data;
@@ -166,7 +166,7 @@ void Canvas::addImage(int16_t x, int16_t y, MarlinImage image, uint16_t *colors)
       }
       return;
     }
-  #endif // BOOT_MARLIN_LOGO_USES_RLE16
+  #endif // COMPACT_MARLIN_BOOT_LOGO
 
   return addImage(x, y, image_width, image_height, color_mode, (uint8_t *)data, colors);
 }

Marlin/src/lcd/tft/tft_image.cpp

@@ -33,7 +33,7 @@ const tImage NoLogo                 = { nullptr, 0, 0, NOCOLORS };
   const tImage MarlinLogo112x38x1   = { (void *)marlin_logo_112x38x1, 112, 38, GREYSCALE1 };
   const tImage MarlinLogo228x255x2  = { (void *)marlin_logo_228x255x2, 228, 255, GREYSCALE2 };
   const tImage MarlinLogo228x255x4  = { (void *)marlin_logo_228x255x4, 228, 255, GREYSCALE4 };
-  #if ENABLED(BOOT_MARLIN_LOGO_USES_RLE16)
+  #if ENABLED(COMPACT_MARLIN_BOOT_LOGO)
     const tImage MarlinLogo195x59x16  = { (void *)marlin_logo_195x59x16_rle16,  195,  59, RLE16 };
     const tImage MarlinLogo320x240x16 = { (void *)marlin_logo_320x240x16_rle16, 320, 240, RLE16 };
     const tImage MarlinLogo480x320x16 = { (void *)marlin_logo_480x320x16_rle16, 480, 320, RLE16 };

Marlin/src/lcd/tft/tft_image.h

@@ -28,7 +28,7 @@
 extern const uint8_t marlin_logo_112x38x1[];
 extern const uint8_t marlin_logo_228x255x2[];
 extern const uint8_t marlin_logo_228x255x4[];
-#if ENABLED(BOOT_MARLIN_LOGO_USES_RLE16)
+#if ENABLED(COMPACT_MARLIN_BOOT_LOGO)
   extern const uint16_t marlin_logo_195x59x16_rle16[];
   extern const uint16_t marlin_logo_320x240x16_rle16[];
   extern const uint16_t marlin_logo_480x320x16_rle16[];
@@ -121,8 +121,8 @@ enum colorMode_t : uint8_t {
   GREYSCALE2,         // 2 bits per pixel
   GREYSCALE4,         // 4 bits per pixel
   HIGHCOLOR           // 16 bits per pixel
-  #if ENABLED(BOOT_MARLIN_LOGO_USES_RLE16)
-    , RLE16           // RLE16 8 bit count and 16 bits per pixel row
+  #if ENABLED(COMPACT_MARLIN_BOOT_LOGO)
+    , RLE16           // RLE16 Compressed 16 bits per pixel row
   #endif
 };
 

buildroot/tests/LERDGEK

@@ -11,7 +11,7 @@ set -e
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_LERDGE_K SERIAL_PORT 1
-opt_enable TFT_GENERIC TFT_INTERFACE_FSMC TFT_COLOR_UI
+opt_enable TFT_GENERIC TFT_INTERFACE_FSMC TFT_COLOR_UI COMPACT_MARLIN_BOOT_LOGO
 exec_test $1 $2 "LERDGE K with Generic FSMC TFT with ColorUI" "$3"
 
 # clean up