diff --git a/include/lv_conf_v7.h b/include/lv_conf_v7.h index f49633ad..eb086dae 100644 --- a/include/lv_conf_v7.h +++ b/include/lv_conf_v7.h @@ -88,6 +88,8 @@ typedef int16_t lv_coord_t; #ifndef LV_MEM_SIZE #if defined(ARDUINO_ARCH_ESP8266) # define LV_MEM_SIZE (12 * 1024U) // Minimum 12 Kb +#elif defined(ESP32S2) +# define LV_MEM_SIZE (20 * 1024U) // 20Kb is much better #elif defined(ARDUINO_ARCH_ESP32) # define LV_MEM_SIZE (48 * 1024U) // 48Kb is much better #else @@ -98,6 +100,8 @@ typedef int16_t lv_coord_t; #ifndef LV_VDB_SIZE #if defined(ARDUINO_ARCH_ESP8266) # define LV_VDB_SIZE (8 * 1024U) // Minimum 8 Kb +#elif defined(ESP32S2) +# define LV_VDB_SIZE (16 * 1024U) // 16kB draw buffer #elif defined(ARDUINO_ARCH_ESP32) # define LV_VDB_SIZE (32 * 1024U) // 32kB draw buffer #else diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini index 724832ca..f2c263c3 100644 --- a/user_setups/esp32s2/_esp32s2.ini +++ b/user_setups/esp32s2/_esp32s2.ini @@ -27,9 +27,7 @@ build_flags = -D NO_GLOBAL_HTTPUPDATE ; dont instantiate httpUpdate ;-D CONFIG_NEWLIB_NANO_FORMAT ; -- lvgl build options ----------------------------- - -D LV_MEM_SIZE=20480U ; 20kB lvgl memory - -D LV_VDB_SIZE=16384U ; 16kB draw buffer - -D LV_ATTRIBUTE_FAST_MEM=IRAM_ATTR + -D LV_ATTRIBUTE_FAST_MEM= ; smaller RAM doesn't allow for IRAM_ATTR -D LV_ATTRIBUTE_TASK_HANDLER=IRAM_ATTR ;-D LV_FS_PC_PATH="//littlefs" ; this needs to match the vfs mount pount ; -- ArduinoJson build options ---------------------------- @@ -71,6 +69,7 @@ lib_ignore = lib_deps = bodmer/TFT_eSPI@2.4.32 ;ESP Async WebServer + git+https://github.com/fvanroie/ConsoleInput.git#dev ps_ram = -DBOARD_HAS_PSRAM diff --git a/user_setups/esp32s2/wt32-86.ini b/user_setups/esp32s2/wt32-86.ini index 36a86ab3..e6c2da96 100644 --- a/user_setups/esp32s2/wt32-86.ini +++ b/user_setups/esp32s2/wt32-86.ini @@ -50,7 +50,7 @@ build_flags = -D LGFX_USE_V1=1 -D SUPPORT_TRANSACTIONS -D SPI_TOUCH_FREQUENCY=2500000 - -D TOUCH_DRIVER=0x6336 ; XPT2046 Resistive SPI touch panel driver + -D TOUCH_DRIVER=0x1680 ; GLS1680 Capacitive I2C touch panel driver -D I2C_TOUCH_PORT=0 -D I2C_TOUCH_ADDRESS=0 @@ -62,7 +62,7 @@ lib_deps = ${env.lib_deps} ${esp32s2.lib_deps} lovyan03/LovyanGFX @ ^0.4.12 - git+https://github.com/aselectroworks/Arduino-FT6336U.git + git+https://github.com/arovak/GSL2038.git lib_ignore = ${env.lib_ignore}