diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a4297d1522..027306f077 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -4655,9 +4655,7 @@ // // CR-6 OEM touch screen. A DWIN display with touch. // -#if ANY(MachineCR6, MachineCR6Max, MachineEnder3Touchscreen) - #define DGUS_LCD_UI_CREALITY_TOUCH -#endif +//#define DGUS_LCD_UI_CREALITY_TOUCH // // Touch-screen LCD for Malyan M200/M300 printers @@ -4697,7 +4695,7 @@ // Third-party or vendor-customized controller interfaces. // Sources should be installed in 'src/lcd/extui'. // -#if ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder6, MachineCR5, MachineEnder7, MachineSermoonD1, MachineCR10Smart, MachineCR10SmartPro) && (NONE(GraphicLCD, OrigLCD)) || ENABLED(INSANITYAUTOMATION_DWIN) +#if ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineEnder6, MachineCR5, MachineEnder7, MachineSermoonD1, MachineCR10Smart, MachineCR10SmartPro) && (NONE(GraphicLCD, OrigLCD)) || ENABLED(INSANITYAUTOMATION_DWIN) || ANY(MachineCR6, MachineCR6Max, MachineEnder3Touchscreen) #ifndef INSANITYAUTOMATION_DWIN #define INSANITYAUTOMATION_DWIN #endif diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp index 78a88e857a..a37262d78e 100644 --- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp +++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp @@ -109,7 +109,7 @@ void MarlinUI::clear_lcd() { #define VERSION_Y 84 #endif dwinJPGShowAndCache(0); // Ensure DACAI stays on boot screen - dwinDrawString(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length * 10) / 2, 230, S(dwin_string.string())); + dwinDrawString(false, font10x20, COLOR_YELLOW, COLOR_BG_BLACK, INFO_CENTER - (dwin_string.length * 10) / 2, 230, S(dwin_string.string())); TERN_(SHOW_CUSTOM_BOOTSCREEN, safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT)); clear_lcd();