✨ TFT_THEME for Anet ET

MarlinFirmware/Marlin#26077
MarlinFirmware · Jul 17, 2023 · c3c6a0b · c3c6a0b
1 parent 8a2094d
commit c3c6a0b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 263 deletions.
diff --git a/config/examples/Anet/ET4+/Configuration.h b/config/examples/Anet/ET4+/Configuration.h
@@ -3353,44 +3353,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/Anet/ET4-Pro/Configuration.h b/config/examples/Anet/ET4-Pro/Configuration.h
@@ -3353,44 +3353,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/Anet/ET4/Configuration.h b/config/examples/Anet/ET4/Configuration.h
@@ -3353,44 +3353,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/Anet/ET4X/Configuration.h b/config/examples/Anet/ET4X/Configuration.h
@@ -3353,44 +3353,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/Anet/ET5-Pro/Configuration.h b/config/examples/Anet/ET5-Pro/Configuration.h
@@ -3348,44 +3348,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/Anet/ET5/Configuration.h b/config/examples/Anet/ET5/Configuration.h
@@ -3348,44 +3348,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/Anet/ET5X/Configuration.h b/config/examples/Anet/ET5X/Configuration.h
@@ -3348,44 +3348,13 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    */
-  #define TFT_THEME BLACK_MARLIN
+  #define TFT_THEME ANET_BLACK
 
   //#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
 
-/* ET4/ET5 Black Theme */
-
-#define COLOR_RED2              0xF003 // #F70019
-#define COLOR_ORANGE2           0xFDE0 // #FFBE00
-#define COLOR_LIME2             0xA7E0 // #A5FF00
-#define COLOR_BLACK2            0x2124 // #212421
-
-#define COLOR_BACKGROUND        COLOR_BLACK2
-#define COLOR_SELECTION_BG      COLOR_ORANGE2
-#define COLOR_COLD              COLOR_WHITE
-#define COLOR_HOTEND            COLOR_RED2
-#define COLOR_HEATED_BED        COLOR_RED2
-#define COLOR_CHAMBER           COLOR_WHITE
-#define COLOR_FAN               COLOR_WHITE
-#define COLOR_AXIS_FRAME        COLOR_WHITE
-#define COLOR_AXIS_HOMED        COLOR_ORANGE2
-#define COLOR_AXIS_NOT_HOMED    COLOR_ORANGE2
-#define COLOR_RATE_100          COLOR_LIME2
-#define COLOR_RATE_ALTERED      COLOR_ORANGE2
-#define COLOR_PRINT_TIME        COLOR_WHITE
-#define COLOR_PROGRESS_BAR      COLOR_ORANGE2
-#define COLOR_STATUS_MESSAGE    COLOR_ORANGE2
-#define COLOR_SD_ENABLED        COLOR_CONTROL_ENABLED
-#define COLOR_SD_DISABLED       COLOR_CONTROL_DISABLED
-#define COLOR_MENU_TEXT         COLOR_WHITE
-#define COLOR_MENU_VALUE_FONT   COLOR_ORANGE2
-#define COLOR_SLIDER            COLOR_ORANGE2
-#define COLOR_INCREASE          COLOR_WHITE
-#define COLOR_DECREASE          COLOR_WHITE
-#define COLOR_TICK              COLOR_VIVID_GREEN
-
 /**
  * TFT Rotation. Set to one of the following values:
  *

diff --git a/config/examples/BIQU/B1 SE Plus/Configuration.h b/config/examples/BIQU/B1 SE Plus/Configuration.h
@@ -3346,14 +3346,13 @@
    * BLACK_MARLIN - Theme with 'black' background
    */
   #define TFT_THEME BLACK_MARLIN
+  #define COLOR_BACKGROUND COLOR_DARK
 
   //#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
 
-#define COLOR_BACKGROUND    COLOR_DARK
-
 #if ENABLED(TFT_LVGL_UI)
   //#define MKS_WIFI_MODULE // MKS WiFi module
 #endif

diff --git a/config/examples/BIQU/B1 SE/Configuration.h b/config/examples/BIQU/B1 SE/Configuration.h
@@ -3346,14 +3346,13 @@
    * BLACK_MARLIN - Theme with 'black' background
    */
   #define TFT_THEME BLACK_MARLIN
+  #define COLOR_BACKGROUND COLOR_DARK
 
   //#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
 
-#define COLOR_BACKGROUND    COLOR_DARK
-
 #if ENABLED(TFT_LVGL_UI)
   //#define MKS_WIFI_MODULE // MKS WiFi module
 #endif

diff --git a/config/examples/BIQU/BX/Configuration.h b/config/examples/BIQU/BX/Configuration.h
@@ -3361,15 +3361,13 @@
    * BLACK_MARLIN - Theme with 'black' background
    */
   #define TFT_THEME BLACK_MARLIN
+  #define COLOR_BACKGROUND COLOR_DARK
 
   //#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
 
-/* Biqu BX Dark Theme */
-#define COLOR_BACKGROUND    COLOR_DARK
-
 #if ENABLED(TFT_LVGL_UI)
   //#define MKS_WIFI_MODULE // MKS WiFi module
 #endif