jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-27 00:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12055 from Jason2866/development

Browse Source 
Core2 compilation fail fixed when enabling LVGL
This commit is contained in:
Theo Arends 2021-05-08 18:26:02 +02:00 committed by GitHub
commit d0958e447f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/displaydesc/M5stack_core2_display.ini
View File

@ -1,6 +1,6 @@
:H,ILI9342,320,240,16,SPI,1,5,18,23,15,-1,-1,38,40 :H,ILI9342,320,240,16,SPI,1,5,18,23,15,-1,-1,38,40
:S,2,1,3,0,100,100 :S,2,1,3,0,100,100
:B,60,1 :B,60,0
:I :I
EF,3,03,80,02 EF,3,03,80,02
CF,3,00,C1,30 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 :3,68,00,00,03
:i,21,20 :i,21,20
:TI2,38,22,21 :TI2,38,22,21
:B,60,0 #
#

16
tasmota/tasmota_configurations_ESP32.h
View File

@ -108,13 +108,19 @@
#define USE_MPU6886 #define USE_MPU6886
#define USE_SPI #define USE_SPI
#define USE_DISPLAY #define USE_DISPLAY
#ifndef USE_UNIVERSAL_DISPLAY #ifdef USE_UNIVERSAL_DISPLAY
#define USE_DISPLAY_ILI9341 #define USE_LVGL
#endif #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 JPEG_PICTS
#define USE_FT5206 #define USE_FT5206
#define USE_TOUCH_BUTTONS
#define MAX_TOUCH_BUTTONS 16
#define USE_SENDMAIL #define USE_SENDMAIL
#define USE_ESP32MAIL #define USE_ESP32MAIL