Skip to content

Commit 867e529

Browse files
thinkyheadthinkyhead
committed
Single DGUS_LCD_UI option
MarlinFirmware/Marlin#25143
1 parent d126b8f commit 867e529

File tree

635 files changed

+5599
-5599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

635 files changed

+5599
-5599
lines changed

‎config/default/Configuration.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -2953,23 +2953,16 @@
29532953

29542954
/**
29552955
* DGUS Touch Display with DWIN OS. (Choose one.)
2956-
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
2957-
* FYSETC : https://www.aliexpress.com/item/32961471929.html
2958-
* MKS : https://www.aliexpress.com/item/1005002008179262.html
2959-
*
2960-
* Flash display with DGUS Displays for Marlin:
2961-
* - Format the SD card to FAT32 with an allocation size of 4kb.
2962-
* - Download files as specified for your type of display.
2963-
* - Plug the microSD card into the back of the display.
2964-
* - Boot the display and wait for the update to complete.
29652956
*
29662957
* ORIGIN (Marlin DWIN_SET)
29672958
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
29682959
* - Copy the downloaded DWIN_SET folder to the SD card.
2960+
* - Product: https://www.aliexpress.com/item/32993409517.html
29692961
*
29702962
* FYSETC (Supplier default)
29712963
* - Download https://github.com/FYSETC/FYSTLCD-2.0
29722964
* - Copy the downloaded SCREEN folder to the SD card.
2965+
* - Product: https://www.aliexpress.com/item/32961471929.html
29732966
*
29742967
* HIPRECY (Supplier default)
29752968
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
@@ -2978,17 +2971,24 @@
29782971
* MKS (MKS-H43) (Supplier default)
29792972
* - Download https://github.com/makerbase-mks/MKS-H43
29802973
* - Copy the downloaded DWIN_SET folder to the SD card.
2974+
* - Product: https://www.aliexpress.com/item/1005002008179262.html
29812975
*
29822976
* RELOADED (T5UID1)
29832977
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
29842978
* - Copy the downloaded DWIN_SET folder to the SD card.
2979+
*
2980+
* IA_CREALITY (T5UID1)
2981+
* - Download https://github.com/InsanityAutomation/Marlin/raw/CrealityDwin2.0_Bleeding/TM3D_Combined480272_Landscape_V7.7z
2982+
* - Copy the downloaded DWIN_SET folder to the SD card.
2983+
*
2984+
* Flash display with DGUS Displays for Marlin:
2985+
* - Format the SD card to FAT32 with an allocation size of 4kb.
2986+
* - Download files as specified for your type of display.
2987+
* - Plug the microSD card into the back of the display.
2988+
* - Boot the display and wait for the update to complete.
29852989
*/
2986-
//#define DGUS_LCD_UI_ORIGIN
2987-
//#define DGUS_LCD_UI_FYSETC
2988-
//#define DGUS_LCD_UI_HIPRECY
2989-
//#define DGUS_LCD_UI_MKS
2990-
//#define DGUS_LCD_UI_RELOADED
2991-
#if ENABLED(DGUS_LCD_UI_MKS)
2990+
//#define DGUS_LCD_UI ORIGIN
2991+
#if DGUS_UI_IS(MKS)
29922992
#define USE_MKS_GREEN_UI
29932993
#endif
29942994

‎config/default/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1880,11 +1880,11 @@
18801880

18811881
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
18821882

1883-
#if ANY(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS, DGUS_LCD_UI_HIPRECY)
1883+
#if DGUS_UI_IS(FYSETC, MKS, HIPRECY)
18841884
#define DGUS_PRINT_FILENAME // Display the filename during printing
18851885
#define DGUS_PREHEAT_UI // Display a preheat screen during heatup
18861886

1887-
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS)
1887+
#if DGUS_UI_IS(FYSETC, MKS)
18881888
//#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for FYSETC and MKS
18891889
#else
18901890
#define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY

‎config/examples/3DFabXYZ/Migbot/Configuration.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -2979,23 +2979,16 @@
29792979

29802980
/**
29812981
* DGUS Touch Display with DWIN OS. (Choose one.)
2982-
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
2983-
* FYSETC : https://www.aliexpress.com/item/32961471929.html
2984-
* MKS : https://www.aliexpress.com/item/1005002008179262.html
2985-
*
2986-
* Flash display with DGUS Displays for Marlin:
2987-
* - Format the SD card to FAT32 with an allocation size of 4kb.
2988-
* - Download files as specified for your type of display.
2989-
* - Plug the microSD card into the back of the display.
2990-
* - Boot the display and wait for the update to complete.
29912982
*
29922983
* ORIGIN (Marlin DWIN_SET)
29932984
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
29942985
* - Copy the downloaded DWIN_SET folder to the SD card.
2986+
* - Product: https://www.aliexpress.com/item/32993409517.html
29952987
*
29962988
* FYSETC (Supplier default)
29972989
* - Download https://github.com/FYSETC/FYSTLCD-2.0
29982990
* - Copy the downloaded SCREEN folder to the SD card.
2991+
* - Product: https://www.aliexpress.com/item/32961471929.html
29992992
*
30002993
* HIPRECY (Supplier default)
30012994
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
@@ -3004,17 +2997,24 @@
30042997
* MKS (MKS-H43) (Supplier default)
30052998
* - Download https://github.com/makerbase-mks/MKS-H43
30062999
* - Copy the downloaded DWIN_SET folder to the SD card.
3000+
* - Product: https://www.aliexpress.com/item/1005002008179262.html
30073001
*
30083002
* RELOADED (T5UID1)
30093003
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
30103004
* - Copy the downloaded DWIN_SET folder to the SD card.
3005+
*
3006+
* IA_CREALITY (T5UID1)
3007+
* - Download https://github.com/InsanityAutomation/Marlin/raw/CrealityDwin2.0_Bleeding/TM3D_Combined480272_Landscape_V7.7z
3008+
* - Copy the downloaded DWIN_SET folder to the SD card.
3009+
*
3010+
* Flash display with DGUS Displays for Marlin:
3011+
* - Format the SD card to FAT32 with an allocation size of 4kb.
3012+
* - Download files as specified for your type of display.
3013+
* - Plug the microSD card into the back of the display.
3014+
* - Boot the display and wait for the update to complete.
30113015
*/
3012-
//#define DGUS_LCD_UI_ORIGIN
3013-
//#define DGUS_LCD_UI_FYSETC
3014-
//#define DGUS_LCD_UI_HIPRECY
3015-
//#define DGUS_LCD_UI_MKS
3016-
//#define DGUS_LCD_UI_RELOADED
3017-
#if ENABLED(DGUS_LCD_UI_MKS)
3016+
//#define DGUS_LCD_UI ORIGIN
3017+
#if DGUS_UI_IS(MKS)
30183018
#define USE_MKS_GREEN_UI
30193019
#endif
30203020

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1880,11 +1880,11 @@
18801880

18811881
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
18821882

1883-
#if ANY(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS, DGUS_LCD_UI_HIPRECY)
1883+
#if DGUS_UI_IS(FYSETC, MKS, HIPRECY)
18841884
#define DGUS_PRINT_FILENAME // Display the filename during printing
18851885
#define DGUS_PREHEAT_UI // Display a preheat screen during heatup
18861886

1887-
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS)
1887+
#if DGUS_UI_IS(FYSETC, MKS)
18881888
//#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for FYSETC and MKS
18891889
#else
18901890
#define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY

‎config/examples/ADIMLab/Gantry v1/Configuration.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -2954,23 +2954,16 @@
29542954

29552955
/**
29562956
* DGUS Touch Display with DWIN OS. (Choose one.)
2957-
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
2958-
* FYSETC : https://www.aliexpress.com/item/32961471929.html
2959-
* MKS : https://www.aliexpress.com/item/1005002008179262.html
2960-
*
2961-
* Flash display with DGUS Displays for Marlin:
2962-
* - Format the SD card to FAT32 with an allocation size of 4kb.
2963-
* - Download files as specified for your type of display.
2964-
* - Plug the microSD card into the back of the display.
2965-
* - Boot the display and wait for the update to complete.
29662957
*
29672958
* ORIGIN (Marlin DWIN_SET)
29682959
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
29692960
* - Copy the downloaded DWIN_SET folder to the SD card.
2961+
* - Product: https://www.aliexpress.com/item/32993409517.html
29702962
*
29712963
* FYSETC (Supplier default)
29722964
* - Download https://github.com/FYSETC/FYSTLCD-2.0
29732965
* - Copy the downloaded SCREEN folder to the SD card.
2966+
* - Product: https://www.aliexpress.com/item/32961471929.html
29742967
*
29752968
* HIPRECY (Supplier default)
29762969
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
@@ -2979,17 +2972,24 @@
29792972
* MKS (MKS-H43) (Supplier default)
29802973
* - Download https://github.com/makerbase-mks/MKS-H43
29812974
* - Copy the downloaded DWIN_SET folder to the SD card.
2975+
* - Product: https://www.aliexpress.com/item/1005002008179262.html
29822976
*
29832977
* RELOADED (T5UID1)
29842978
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
29852979
* - Copy the downloaded DWIN_SET folder to the SD card.
2980+
*
2981+
* IA_CREALITY (T5UID1)
2982+
* - Download https://github.com/InsanityAutomation/Marlin/raw/CrealityDwin2.0_Bleeding/TM3D_Combined480272_Landscape_V7.7z
2983+
* - Copy the downloaded DWIN_SET folder to the SD card.
2984+
*
2985+
* Flash display with DGUS Displays for Marlin:
2986+
* - Format the SD card to FAT32 with an allocation size of 4kb.
2987+
* - Download files as specified for your type of display.
2988+
* - Plug the microSD card into the back of the display.
2989+
* - Boot the display and wait for the update to complete.
29862990
*/
2987-
//#define DGUS_LCD_UI_ORIGIN
2988-
//#define DGUS_LCD_UI_FYSETC
2989-
//#define DGUS_LCD_UI_HIPRECY
2990-
//#define DGUS_LCD_UI_MKS
2991-
//#define DGUS_LCD_UI_RELOADED
2992-
#if ENABLED(DGUS_LCD_UI_MKS)
2991+
//#define DGUS_LCD_UI ORIGIN
2992+
#if DGUS_UI_IS(MKS)
29932993
#define USE_MKS_GREEN_UI
29942994
#endif
29952995

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1880,11 +1880,11 @@
18801880

18811881
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
18821882

1883-
#if ANY(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS, DGUS_LCD_UI_HIPRECY)
1883+
#if DGUS_UI_IS(FYSETC, MKS, HIPRECY)
18841884
#define DGUS_PRINT_FILENAME // Display the filename during printing
18851885
#define DGUS_PREHEAT_UI // Display a preheat screen during heatup
18861886

1887-
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS)
1887+
#if DGUS_UI_IS(FYSETC, MKS)
18881888
//#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for FYSETC and MKS
18891889
#else
18901890
#define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY

‎config/examples/ADIMLab/Gantry v2/Configuration.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -2954,23 +2954,16 @@
29542954

29552955
/**
29562956
* DGUS Touch Display with DWIN OS. (Choose one.)
2957-
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
2958-
* FYSETC : https://www.aliexpress.com/item/32961471929.html
2959-
* MKS : https://www.aliexpress.com/item/1005002008179262.html
2960-
*
2961-
* Flash display with DGUS Displays for Marlin:
2962-
* - Format the SD card to FAT32 with an allocation size of 4kb.
2963-
* - Download files as specified for your type of display.
2964-
* - Plug the microSD card into the back of the display.
2965-
* - Boot the display and wait for the update to complete.
29662957
*
29672958
* ORIGIN (Marlin DWIN_SET)
29682959
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
29692960
* - Copy the downloaded DWIN_SET folder to the SD card.
2961+
* - Product: https://www.aliexpress.com/item/32993409517.html
29702962
*
29712963
* FYSETC (Supplier default)
29722964
* - Download https://github.com/FYSETC/FYSTLCD-2.0
29732965
* - Copy the downloaded SCREEN folder to the SD card.
2966+
* - Product: https://www.aliexpress.com/item/32961471929.html
29742967
*
29752968
* HIPRECY (Supplier default)
29762969
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
@@ -2979,17 +2972,24 @@
29792972
* MKS (MKS-H43) (Supplier default)
29802973
* - Download https://github.com/makerbase-mks/MKS-H43
29812974
* - Copy the downloaded DWIN_SET folder to the SD card.
2975+
* - Product: https://www.aliexpress.com/item/1005002008179262.html
29822976
*
29832977
* RELOADED (T5UID1)
29842978
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
29852979
* - Copy the downloaded DWIN_SET folder to the SD card.
2980+
*
2981+
* IA_CREALITY (T5UID1)
2982+
* - Download https://github.com/InsanityAutomation/Marlin/raw/CrealityDwin2.0_Bleeding/TM3D_Combined480272_Landscape_V7.7z
2983+
* - Copy the downloaded DWIN_SET folder to the SD card.
2984+
*
2985+
* Flash display with DGUS Displays for Marlin:
2986+
* - Format the SD card to FAT32 with an allocation size of 4kb.
2987+
* - Download files as specified for your type of display.
2988+
* - Plug the microSD card into the back of the display.
2989+
* - Boot the display and wait for the update to complete.
29862990
*/
2987-
//#define DGUS_LCD_UI_ORIGIN
2988-
//#define DGUS_LCD_UI_FYSETC
2989-
//#define DGUS_LCD_UI_HIPRECY
2990-
//#define DGUS_LCD_UI_MKS
2991-
//#define DGUS_LCD_UI_RELOADED
2992-
#if ENABLED(DGUS_LCD_UI_MKS)
2991+
//#define DGUS_LCD_UI ORIGIN
2992+
#if DGUS_UI_IS(MKS)
29932993
#define USE_MKS_GREEN_UI
29942994
#endif
29952995

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1880,11 +1880,11 @@
18801880

18811881
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
18821882

1883-
#if ANY(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS, DGUS_LCD_UI_HIPRECY)
1883+
#if DGUS_UI_IS(FYSETC, MKS, HIPRECY)
18841884
#define DGUS_PRINT_FILENAME // Display the filename during printing
18851885
#define DGUS_PREHEAT_UI // Display a preheat screen during heatup
18861886

1887-
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS)
1887+
#if DGUS_UI_IS(FYSETC, MKS)
18881888
//#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for FYSETC and MKS
18891889
#else
18901890
#define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY

‎config/examples/Alfawise/U20-bltouch/Configuration.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -3032,23 +3032,16 @@
30323032

30333033
/**
30343034
* DGUS Touch Display with DWIN OS. (Choose one.)
3035-
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
3036-
* FYSETC : https://www.aliexpress.com/item/32961471929.html
3037-
* MKS : https://www.aliexpress.com/item/1005002008179262.html
3038-
*
3039-
* Flash display with DGUS Displays for Marlin:
3040-
* - Format the SD card to FAT32 with an allocation size of 4kb.
3041-
* - Download files as specified for your type of display.
3042-
* - Plug the microSD card into the back of the display.
3043-
* - Boot the display and wait for the update to complete.
30443035
*
30453036
* ORIGIN (Marlin DWIN_SET)
30463037
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
30473038
* - Copy the downloaded DWIN_SET folder to the SD card.
3039+
* - Product: https://www.aliexpress.com/item/32993409517.html
30483040
*
30493041
* FYSETC (Supplier default)
30503042
* - Download https://github.com/FYSETC/FYSTLCD-2.0
30513043
* - Copy the downloaded SCREEN folder to the SD card.
3044+
* - Product: https://www.aliexpress.com/item/32961471929.html
30523045
*
30533046
* HIPRECY (Supplier default)
30543047
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
@@ -3057,17 +3050,24 @@
30573050
* MKS (MKS-H43) (Supplier default)
30583051
* - Download https://github.com/makerbase-mks/MKS-H43
30593052
* - Copy the downloaded DWIN_SET folder to the SD card.
3053+
* - Product: https://www.aliexpress.com/item/1005002008179262.html
30603054
*
30613055
* RELOADED (T5UID1)
30623056
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
30633057
* - Copy the downloaded DWIN_SET folder to the SD card.
3058+
*
3059+
* IA_CREALITY (T5UID1)
3060+
* - Download https://github.com/InsanityAutomation/Marlin/raw/CrealityDwin2.0_Bleeding/TM3D_Combined480272_Landscape_V7.7z
3061+
* - Copy the downloaded DWIN_SET folder to the SD card.
3062+
*
3063+
* Flash display with DGUS Displays for Marlin:
3064+
* - Format the SD card to FAT32 with an allocation size of 4kb.
3065+
* - Download files as specified for your type of display.
3066+
* - Plug the microSD card into the back of the display.
3067+
* - Boot the display and wait for the update to complete.
30643068
*/
3065-
//#define DGUS_LCD_UI_ORIGIN
3066-
//#define DGUS_LCD_UI_FYSETC
3067-
//#define DGUS_LCD_UI_HIPRECY
3068-
//#define DGUS_LCD_UI_MKS
3069-
//#define DGUS_LCD_UI_RELOADED
3070-
#if ENABLED(DGUS_LCD_UI_MKS)
3069+
//#define DGUS_LCD_UI ORIGIN
3070+
#if DGUS_UI_IS(MKS)
30713071
#define USE_MKS_GREEN_UI
30723072
#endif
30733073

‎config/examples/Alfawise/U20-bltouch/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1889,11 +1889,11 @@
18891889

18901890
#define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
18911891

1892-
#if ANY(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS, DGUS_LCD_UI_HIPRECY)
1892+
#if DGUS_UI_IS(FYSETC, MKS, HIPRECY)
18931893
#define DGUS_PRINT_FILENAME // Display the filename during printing
18941894
#define DGUS_PREHEAT_UI // Display a preheat screen during heatup
18951895

1896-
#if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS)
1896+
#if DGUS_UI_IS(FYSETC, MKS)
18971897
//#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for FYSETC and MKS
18981898
#else
18991899
#define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY

0 commit comments

Comments
 (0)