From 7108e4ef078191ea639d93dccadff86d4a183a3c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 8 May 2021 17:24:04 +0200 Subject: [PATCH 1/6] Core2 LVGL fixes --- tasmota/displaydesc/M5stack_core2_display.ini | 3 +-- tasmota/tasmota_configurations_ESP32.h | 11 +++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tasmota/displaydesc/M5stack_core2_display.ini b/tasmota/displaydesc/M5stack_core2_display.ini index a56b4428b..ed59f810e 100644 --- a/tasmota/displaydesc/M5stack_core2_display.ini +++ b/tasmota/displaydesc/M5stack_core2_display.ini @@ -34,6 +34,5 @@ E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F :2,C8,00,00,02 :3,68,00,00,03 :i,21,20 -:TI2,38,22,21 -:B,60,0 +:TI2,38,22,2 # \ No newline at end of file diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index 89e295e89..710e49dcb 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -108,17 +108,20 @@ #define USE_MPU6886 #define USE_SPI #define USE_DISPLAY + #ifndef USE_UNIVERSAL_DISPLAY #define USE_DISPLAY_ILI9341 - #endif - #define JPEG_PICTS - #define USE_FT5206 #define USE_TOUCH_BUTTONS #define MAX_TOUCH_BUTTONS 16 + #endif + + #define JPEG_PICTS + #define USE_FT5206 + #define USE_SENDMAIL #define USE_ESP32MAIL -#define USE_SCRIPT // Add support for script (+17k code) +//#define USE_SCRIPT // Add support for script (+17k code) // Script related defines #ifdef USE_SCRIPT #undef USE_RULES From 4497db4fc9aec2cdacf2b218e9d5ee0910fb2ef9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 8 May 2021 17:29:27 +0200 Subject: [PATCH 2/6] reenable scripter --- tasmota/displaydesc/M5stack_core2_display.ini | 2 +- tasmota/tasmota_configurations_ESP32.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasmota/displaydesc/M5stack_core2_display.ini b/tasmota/displaydesc/M5stack_core2_display.ini index ed59f810e..791b96c01 100644 --- a/tasmota/displaydesc/M5stack_core2_display.ini +++ b/tasmota/displaydesc/M5stack_core2_display.ini @@ -35,4 +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,2 -# \ No newline at end of file +# diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index 710e49dcb..c976ca364 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -121,7 +121,7 @@ #define USE_SENDMAIL #define USE_ESP32MAIL -//#define USE_SCRIPT // Add support for script (+17k code) +#define USE_SCRIPT // Add support for script (+17k code) // Script related defines #ifdef USE_SCRIPT #undef USE_RULES From a2e743b19f369791f6f860a3ccd7fd1ace43d514 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 8 May 2021 17:38:51 +0200 Subject: [PATCH 3/6] changed #ifdef for lvgl --- tasmota/tasmota_configurations_ESP32.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index c976ca364..9c36aa15e 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -108,13 +108,16 @@ #define USE_MPU6886 #define USE_SPI #define USE_DISPLAY - - #ifndef USE_UNIVERSAL_DISPLAY - #define USE_DISPLAY_ILI9341 - #define USE_TOUCH_BUTTONS - #define MAX_TOUCH_BUTTONS 16 - #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 From 223d4a66bc32cdc34d99a67c5710597500b7d8b7 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 8 May 2021 17:41:16 +0200 Subject: [PATCH 4/6] :B,60,0 readded --- tasmota/displaydesc/M5stack_core2_display.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tasmota/displaydesc/M5stack_core2_display.ini b/tasmota/displaydesc/M5stack_core2_display.ini index 791b96c01..4104a007b 100644 --- a/tasmota/displaydesc/M5stack_core2_display.ini +++ b/tasmota/displaydesc/M5stack_core2_display.ini @@ -35,4 +35,5 @@ 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,2 +:B,60,0 # From a7c403adff07c105667b94ddfe7ff22e4f916077 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 8 May 2021 17:42:48 +0200 Subject: [PATCH 5/6] grrrr editing --- tasmota/displaydesc/M5stack_core2_display.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/displaydesc/M5stack_core2_display.ini b/tasmota/displaydesc/M5stack_core2_display.ini index 4104a007b..4e1721514 100644 --- a/tasmota/displaydesc/M5stack_core2_display.ini +++ b/tasmota/displaydesc/M5stack_core2_display.ini @@ -34,6 +34,6 @@ E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F :2,C8,00,00,02 :3,68,00,00,03 :i,21,20 -:TI2,38,22,2 +:TI2,38,22,21 :B,60,0 # From 0e233b5692889bd118d8917751edac2682ae3ab9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 8 May 2021 17:48:53 +0200 Subject: [PATCH 6/6] after talking in Discord :-) --- tasmota/displaydesc/M5stack_core2_display.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasmota/displaydesc/M5stack_core2_display.ini b/tasmota/displaydesc/M5stack_core2_display.ini index 4e1721514..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 #