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

Fix compile error with Berry defined. (#12616)

Browse Source 
* Update xdrv_54_lvgl.ino

Fix compile error with LVGL define and without USE_BERRY defined

* Update xdrv_54_lvgl.ino

Fix compile error without Berry define.

* GPIO_XPT2046_CS is not specific to ILI9341

GPIO_XPT2046_CS is not specific to ILI9341 it is also used with ILI9488
This commit is contained in:
mikep1998 2021-07-11 00:38:41 -07:00 committed by GitHub
parent 44890833d5
commit c76b336545
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/tasmota_template.h
View File

@ -471,10 +471,12 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#ifdef USE_DISPLAY_ILI9341
AGPIO(GPIO_ILI9341_CS),
AGPIO(GPIO_ILI9341_DC),
#endif // USE_DISPLAY_ILI9341
#ifdef USE_XPT2046
AGPIO(GPIO_XPT2046_CS), // XPT2046 SPI Chip Select
#endif
#endif // USE_DISPLAY_ILI9341
#ifdef USE_DISPLAY_ILI9488
AGPIO(GPIO_ILI9488_CS),
#endif // USE_DISPLAY_ILI9488

2
tasmota/xdrv_54_lvgl.ino
View File

@ -401,11 +401,11 @@ void start_lvgl(const char * uconfig) {
#ifdef USE_BERRY
lv_obj_set_style_local_bg_color(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, lv_color_from_uint32(USE_LVGL_BG_DEFAULT));
lv_obj_set_style_local_bg_opa(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
#endif
#if LV_USE_LOG
lv_log_register_print_cb(lvbe_debug);
#endif // LV_USE_LOG
#endif
#ifdef USE_UFILESYS
// Add file system mapping