diff --git a/tasmota/displaydesc/M5stack_core2_display.ini b/tasmota/displaydesc/M5stack_core2_display.ini index a56b4428b..92306825a 100644 --- a/tasmota/displaydesc/M5stack_core2_display.ini +++ b/tasmota/displaydesc/M5stack_core2_display.ini @@ -1,6 +1,6 @@ :H,ILI9342,320,240,16,SPI,1,5,18,23,15,-1,-1,38,40 :S,2,1,3,0,100,100 -:B,60,1 +:B,60,0 :I EF,3,03,80,02 CF,3,00,C1,30 @@ -35,5 +35,4 @@ E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F :3,68,00,00,03 :i,21,20 :TI2,38,22,21 -:B,60,0 -# \ No newline at end of file +# diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index 89e295e89..9c36aa15e 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -108,13 +108,19 @@ #define USE_MPU6886 #define USE_SPI #define USE_DISPLAY - #ifndef USE_UNIVERSAL_DISPLAY - #define USE_DISPLAY_ILI9341 - #endif +#ifdef USE_UNIVERSAL_DISPLAY + #define USE_LVGL + #define USE_DISPLAY_LVGL_ONLY + #define USE_TOUCH_SCREEN +#else + #define USE_DISPLAY_ILI9341 // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code) + #define USE_DISPLAY_MODES1TO5 + #define USE_TOUCH_BUTTONS + #define MAX_TOUCH_BUTTONS 16 +#endif #define JPEG_PICTS #define USE_FT5206 - #define USE_TOUCH_BUTTONS - #define MAX_TOUCH_BUTTONS 16 + #define USE_SENDMAIL #define USE_ESP32MAIL