Skip to content

Commit c3c6a0b

Browse files
thinkyheadthinkyhead
committed
✨ TFT_THEME for Anet ET
MarlinFirmware/Marlin#26077
1 parent 8a2094d commit c3c6a0b

File tree

11 files changed

+11
-263
lines changed

11 files changed

+11
-263
lines changed

‎config/examples/Anet/ET4+/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3353,44 +3353,13 @@
33533353
* BLUE_MARLIN - Default theme with 'midnight blue' background
33543354
* BLACK_MARLIN - Theme with 'black' background
33553355
*/
3356-
#define TFT_THEME BLACK_MARLIN
3356+
#define TFT_THEME ANET_BLACK
33573357

33583358
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33593359

33603360
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33613361
#endif
33623362

3363-
/* ET4/ET5 Black Theme */
3364-
3365-
#define COLOR_RED2 0xF003 // #F70019
3366-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3367-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3368-
#define COLOR_BLACK2 0x2124 // #212421
3369-
3370-
#define COLOR_BACKGROUND COLOR_BLACK2
3371-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3372-
#define COLOR_COLD COLOR_WHITE
3373-
#define COLOR_HOTEND COLOR_RED2
3374-
#define COLOR_HEATED_BED COLOR_RED2
3375-
#define COLOR_CHAMBER COLOR_WHITE
3376-
#define COLOR_FAN COLOR_WHITE
3377-
#define COLOR_AXIS_FRAME COLOR_WHITE
3378-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3379-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3380-
#define COLOR_RATE_100 COLOR_LIME2
3381-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3382-
#define COLOR_PRINT_TIME COLOR_WHITE
3383-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3384-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3385-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3386-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3387-
#define COLOR_MENU_TEXT COLOR_WHITE
3388-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3389-
#define COLOR_SLIDER COLOR_ORANGE2
3390-
#define COLOR_INCREASE COLOR_WHITE
3391-
#define COLOR_DECREASE COLOR_WHITE
3392-
#define COLOR_TICK COLOR_VIVID_GREEN
3393-
33943363
/**
33953364
* TFT Rotation. Set to one of the following values:
33963365
*

‎config/examples/Anet/ET4-Pro/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3353,44 +3353,13 @@
33533353
* BLUE_MARLIN - Default theme with 'midnight blue' background
33543354
* BLACK_MARLIN - Theme with 'black' background
33553355
*/
3356-
#define TFT_THEME BLACK_MARLIN
3356+
#define TFT_THEME ANET_BLACK
33573357

33583358
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33593359

33603360
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33613361
#endif
33623362

3363-
/* ET4/ET5 Black Theme */
3364-
3365-
#define COLOR_RED2 0xF003 // #F70019
3366-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3367-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3368-
#define COLOR_BLACK2 0x2124 // #212421
3369-
3370-
#define COLOR_BACKGROUND COLOR_BLACK2
3371-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3372-
#define COLOR_COLD COLOR_WHITE
3373-
#define COLOR_HOTEND COLOR_RED2
3374-
#define COLOR_HEATED_BED COLOR_RED2
3375-
#define COLOR_CHAMBER COLOR_WHITE
3376-
#define COLOR_FAN COLOR_WHITE
3377-
#define COLOR_AXIS_FRAME COLOR_WHITE
3378-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3379-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3380-
#define COLOR_RATE_100 COLOR_LIME2
3381-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3382-
#define COLOR_PRINT_TIME COLOR_WHITE
3383-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3384-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3385-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3386-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3387-
#define COLOR_MENU_TEXT COLOR_WHITE
3388-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3389-
#define COLOR_SLIDER COLOR_ORANGE2
3390-
#define COLOR_INCREASE COLOR_WHITE
3391-
#define COLOR_DECREASE COLOR_WHITE
3392-
#define COLOR_TICK COLOR_VIVID_GREEN
3393-
33943363
/**
33953364
* TFT Rotation. Set to one of the following values:
33963365
*

‎config/examples/Anet/ET4/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3353,44 +3353,13 @@
33533353
* BLUE_MARLIN - Default theme with 'midnight blue' background
33543354
* BLACK_MARLIN - Theme with 'black' background
33553355
*/
3356-
#define TFT_THEME BLACK_MARLIN
3356+
#define TFT_THEME ANET_BLACK
33573357

33583358
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33593359

33603360
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33613361
#endif
33623362

3363-
/* ET4/ET5 Black Theme */
3364-
3365-
#define COLOR_RED2 0xF003 // #F70019
3366-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3367-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3368-
#define COLOR_BLACK2 0x2124 // #212421
3369-
3370-
#define COLOR_BACKGROUND COLOR_BLACK2
3371-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3372-
#define COLOR_COLD COLOR_WHITE
3373-
#define COLOR_HOTEND COLOR_RED2
3374-
#define COLOR_HEATED_BED COLOR_RED2
3375-
#define COLOR_CHAMBER COLOR_WHITE
3376-
#define COLOR_FAN COLOR_WHITE
3377-
#define COLOR_AXIS_FRAME COLOR_WHITE
3378-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3379-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3380-
#define COLOR_RATE_100 COLOR_LIME2
3381-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3382-
#define COLOR_PRINT_TIME COLOR_WHITE
3383-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3384-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3385-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3386-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3387-
#define COLOR_MENU_TEXT COLOR_WHITE
3388-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3389-
#define COLOR_SLIDER COLOR_ORANGE2
3390-
#define COLOR_INCREASE COLOR_WHITE
3391-
#define COLOR_DECREASE COLOR_WHITE
3392-
#define COLOR_TICK COLOR_VIVID_GREEN
3393-
33943363
/**
33953364
* TFT Rotation. Set to one of the following values:
33963365
*

‎config/examples/Anet/ET4X/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3353,44 +3353,13 @@
33533353
* BLUE_MARLIN - Default theme with 'midnight blue' background
33543354
* BLACK_MARLIN - Theme with 'black' background
33553355
*/
3356-
#define TFT_THEME BLACK_MARLIN
3356+
#define TFT_THEME ANET_BLACK
33573357

33583358
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33593359

33603360
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33613361
#endif
33623362

3363-
/* ET4/ET5 Black Theme */
3364-
3365-
#define COLOR_RED2 0xF003 // #F70019
3366-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3367-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3368-
#define COLOR_BLACK2 0x2124 // #212421
3369-
3370-
#define COLOR_BACKGROUND COLOR_BLACK2
3371-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3372-
#define COLOR_COLD COLOR_WHITE
3373-
#define COLOR_HOTEND COLOR_RED2
3374-
#define COLOR_HEATED_BED COLOR_RED2
3375-
#define COLOR_CHAMBER COLOR_WHITE
3376-
#define COLOR_FAN COLOR_WHITE
3377-
#define COLOR_AXIS_FRAME COLOR_WHITE
3378-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3379-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3380-
#define COLOR_RATE_100 COLOR_LIME2
3381-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3382-
#define COLOR_PRINT_TIME COLOR_WHITE
3383-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3384-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3385-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3386-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3387-
#define COLOR_MENU_TEXT COLOR_WHITE
3388-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3389-
#define COLOR_SLIDER COLOR_ORANGE2
3390-
#define COLOR_INCREASE COLOR_WHITE
3391-
#define COLOR_DECREASE COLOR_WHITE
3392-
#define COLOR_TICK COLOR_VIVID_GREEN
3393-
33943363
/**
33953364
* TFT Rotation. Set to one of the following values:
33963365
*

‎config/examples/Anet/ET5-Pro/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3348,44 +3348,13 @@
33483348
* BLUE_MARLIN - Default theme with 'midnight blue' background
33493349
* BLACK_MARLIN - Theme with 'black' background
33503350
*/
3351-
#define TFT_THEME BLACK_MARLIN
3351+
#define TFT_THEME ANET_BLACK
33523352

33533353
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33543354

33553355
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33563356
#endif
33573357

3358-
/* ET4/ET5 Black Theme */
3359-
3360-
#define COLOR_RED2 0xF003 // #F70019
3361-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3362-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3363-
#define COLOR_BLACK2 0x2124 // #212421
3364-
3365-
#define COLOR_BACKGROUND COLOR_BLACK2
3366-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3367-
#define COLOR_COLD COLOR_WHITE
3368-
#define COLOR_HOTEND COLOR_RED2
3369-
#define COLOR_HEATED_BED COLOR_RED2
3370-
#define COLOR_CHAMBER COLOR_WHITE
3371-
#define COLOR_FAN COLOR_WHITE
3372-
#define COLOR_AXIS_FRAME COLOR_WHITE
3373-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3374-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3375-
#define COLOR_RATE_100 COLOR_LIME2
3376-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3377-
#define COLOR_PRINT_TIME COLOR_WHITE
3378-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3379-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3380-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3381-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3382-
#define COLOR_MENU_TEXT COLOR_WHITE
3383-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3384-
#define COLOR_SLIDER COLOR_ORANGE2
3385-
#define COLOR_INCREASE COLOR_WHITE
3386-
#define COLOR_DECREASE COLOR_WHITE
3387-
#define COLOR_TICK COLOR_VIVID_GREEN
3388-
33893358
/**
33903359
* TFT Rotation. Set to one of the following values:
33913360
*

‎config/examples/Anet/ET5/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3348,44 +3348,13 @@
33483348
* BLUE_MARLIN - Default theme with 'midnight blue' background
33493349
* BLACK_MARLIN - Theme with 'black' background
33503350
*/
3351-
#define TFT_THEME BLACK_MARLIN
3351+
#define TFT_THEME ANET_BLACK
33523352

33533353
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33543354

33553355
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33563356
#endif
33573357

3358-
/* ET4/ET5 Black Theme */
3359-
3360-
#define COLOR_RED2 0xF003 // #F70019
3361-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3362-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3363-
#define COLOR_BLACK2 0x2124 // #212421
3364-
3365-
#define COLOR_BACKGROUND COLOR_BLACK2
3366-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3367-
#define COLOR_COLD COLOR_WHITE
3368-
#define COLOR_HOTEND COLOR_RED2
3369-
#define COLOR_HEATED_BED COLOR_RED2
3370-
#define COLOR_CHAMBER COLOR_WHITE
3371-
#define COLOR_FAN COLOR_WHITE
3372-
#define COLOR_AXIS_FRAME COLOR_WHITE
3373-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3374-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3375-
#define COLOR_RATE_100 COLOR_LIME2
3376-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3377-
#define COLOR_PRINT_TIME COLOR_WHITE
3378-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3379-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3380-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3381-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3382-
#define COLOR_MENU_TEXT COLOR_WHITE
3383-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3384-
#define COLOR_SLIDER COLOR_ORANGE2
3385-
#define COLOR_INCREASE COLOR_WHITE
3386-
#define COLOR_DECREASE COLOR_WHITE
3387-
#define COLOR_TICK COLOR_VIVID_GREEN
3388-
33893358
/**
33903359
* TFT Rotation. Set to one of the following values:
33913360
*

‎config/examples/Anet/ET5X/Configuration.h

+1-32
Original file line numberDiff line numberDiff line change
@@ -3348,44 +3348,13 @@
33483348
* BLUE_MARLIN - Default theme with 'midnight blue' background
33493349
* BLACK_MARLIN - Theme with 'black' background
33503350
*/
3351-
#define TFT_THEME BLACK_MARLIN
3351+
#define TFT_THEME ANET_BLACK
33523352

33533353
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33543354

33553355
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33563356
#endif
33573357

3358-
/* ET4/ET5 Black Theme */
3359-
3360-
#define COLOR_RED2 0xF003 // #F70019
3361-
#define COLOR_ORANGE2 0xFDE0 // #FFBE00
3362-
#define COLOR_LIME2 0xA7E0 // #A5FF00
3363-
#define COLOR_BLACK2 0x2124 // #212421
3364-
3365-
#define COLOR_BACKGROUND COLOR_BLACK2
3366-
#define COLOR_SELECTION_BG COLOR_ORANGE2
3367-
#define COLOR_COLD COLOR_WHITE
3368-
#define COLOR_HOTEND COLOR_RED2
3369-
#define COLOR_HEATED_BED COLOR_RED2
3370-
#define COLOR_CHAMBER COLOR_WHITE
3371-
#define COLOR_FAN COLOR_WHITE
3372-
#define COLOR_AXIS_FRAME COLOR_WHITE
3373-
#define COLOR_AXIS_HOMED COLOR_ORANGE2
3374-
#define COLOR_AXIS_NOT_HOMED COLOR_ORANGE2
3375-
#define COLOR_RATE_100 COLOR_LIME2
3376-
#define COLOR_RATE_ALTERED COLOR_ORANGE2
3377-
#define COLOR_PRINT_TIME COLOR_WHITE
3378-
#define COLOR_PROGRESS_BAR COLOR_ORANGE2
3379-
#define COLOR_STATUS_MESSAGE COLOR_ORANGE2
3380-
#define COLOR_SD_ENABLED COLOR_CONTROL_ENABLED
3381-
#define COLOR_SD_DISABLED COLOR_CONTROL_DISABLED
3382-
#define COLOR_MENU_TEXT COLOR_WHITE
3383-
#define COLOR_MENU_VALUE_FONT COLOR_ORANGE2
3384-
#define COLOR_SLIDER COLOR_ORANGE2
3385-
#define COLOR_INCREASE COLOR_WHITE
3386-
#define COLOR_DECREASE COLOR_WHITE
3387-
#define COLOR_TICK COLOR_VIVID_GREEN
3388-
33893358
/**
33903359
* TFT Rotation. Set to one of the following values:
33913360
*

‎config/examples/BIQU/B1 SE Plus/Configuration.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -3346,14 +3346,13 @@
33463346
* BLACK_MARLIN - Theme with 'black' background
33473347
*/
33483348
#define TFT_THEME BLACK_MARLIN
3349+
#define COLOR_BACKGROUND COLOR_DARK
33493350

33503351
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33513352

33523353
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33533354
#endif
33543355

3355-
#define COLOR_BACKGROUND COLOR_DARK
3356-
33573356
#if ENABLED(TFT_LVGL_UI)
33583357
//#define MKS_WIFI_MODULE // MKS WiFi module
33593358
#endif

‎config/examples/BIQU/B1 SE/Configuration.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -3346,14 +3346,13 @@
33463346
* BLACK_MARLIN - Theme with 'black' background
33473347
*/
33483348
#define TFT_THEME BLACK_MARLIN
3349+
#define COLOR_BACKGROUND COLOR_DARK
33493350

33503351
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33513352

33523353
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33533354
#endif
33543355

3355-
#define COLOR_BACKGROUND COLOR_DARK
3356-
33573356
#if ENABLED(TFT_LVGL_UI)
33583357
//#define MKS_WIFI_MODULE // MKS WiFi module
33593358
#endif

‎config/examples/BIQU/BX/Configuration.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -3361,15 +3361,13 @@
33613361
* BLACK_MARLIN - Theme with 'black' background
33623362
*/
33633363
#define TFT_THEME BLACK_MARLIN
3364+
#define COLOR_BACKGROUND COLOR_DARK
33643365

33653366
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
33663367

33673368
#define COMPACT_MARLIN_BOOT_LOGO // Use compressed data to save Flash space.
33683369
#endif
33693370

3370-
/* Biqu BX Dark Theme */
3371-
#define COLOR_BACKGROUND COLOR_DARK
3372-
33733371
#if ENABLED(TFT_LVGL_UI)
33743372
//#define MKS_WIFI_MODULE // MKS WiFi module
33753373
#endif

0 commit comments

Comments
 (0)