Merge pull request #1 from lvgl/master

Merge from lvgl

Author: tore-espressif

Makefile

@@ -6,7 +6,8 @@
 PROJECT_NAME := lvgl-demo
 
 # Add new components (source folders)
-EXTRA_COMPONENT_DIRS := components/lvgl_esp32_drivers/lvgl_tft components/lvgl_esp32_drivers/lvgl_touch
+EXTRA_COMPONENT_DIRS := components/lvgl_esp32_drivers/lvgl_tft
+EXTRA_COMPONENT_DIRS += components/lvgl_esp32_drivers/lvgl_touch
 # Must be before include $(IDF_PATH)/make/project.mk
 # $(PROJECT_PATH)/xxx didn't work -> use $(abspath xxx) instead
 

README.md

@@ -113,13 +113,23 @@ int app_main(void)
     /* hw_loop(); */
 
     return 0;
+}
 ```
 
 For more information see: [platformio with espidf framework compability](https://github.com/lvgl/lv_port_esp32/issues/168).
 
 # ESP32-S2 Support
 
-Support for ESP32-S2 variant isn't tested, the current drivers implementation
-would needs to be improved because this target available memory is less than
-ESP32 targets. The menuconfig interface also would need to be improved to take
-this into account.
+Support for ESP32-S2 variant is Work In Progress.
+Smaller displays (e.g. 320x240) work fine, but larger ones need testing.
+
+## Background
+
+ESP32-S2 has less on-chip SRAM than its predecessor ESP32 (520kB vs. 320kB).
+This causes problems with memory allocation with large LVGL display buffers as they don't fit into the on-chip memory
+and external PSRAM is not accessible by DMA.
+
+Moreover, static allocation to external PSRAM is not yet supported
+(see [GitHub issue](https://github.com/espressif/esp-idf/issues/6162)).
+
+At this momement, the buffers are dynamicaly allocated with DMA capabilty and memory allocator handles the rest.

components/lv_examples/Kconfig

@@ -12,11 +12,6 @@ menu "lv_examples configuration"
         config LV_USE_DEMO_WIDGETS
             bool "Show demo widgets."
 
-        config LV_DEMO_WIDGETS_SLIDESHOW
-            bool "Slide demo widgets automatically."
-            depends on LV_USE_DEMO_WIDGETS
-            default y
-
         config LV_USE_DEMO_KEYPAD_AND_ENCODER
             bool "Demonstrate the usage of encoder and keyboard."
 
@@ -26,4 +21,9 @@ menu "lv_examples configuration"
         config LV_USE_DEMO_STRESS
             bool "Stress test for LVGL."
     endchoice
+    
+    config LV_DEMO_WIDGETS_SLIDESHOW
+        bool "Slide demo widgets automatically."
+        depends on LV_USE_DEMO_WIDGETS
+        default y
 endmenu

components/lvgl_esp32_drivers

@@ -3,4 +3,5 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
-CFLAGS+= -DLV_CONF_INCLUDE_SIMPLE
+CFLAGS += -DLV_CONF_INCLUDE_SIMPLE
+CFLAGS += -DLV_LVGL_H_INCLUDE_SIMPLE

main/component.mk

@@ -1,5 +1,5 @@
 /* LVGL Example project
- * 
+ *
  * Basic project to test LVGL on ESP32 based projects.
  *
  * This example code is in the Public Domain (or CC0 licensed, at your option.)
@@ -60,7 +60,7 @@ static void create_demo_application(void);
  *   APPLICATION MAIN
  **********************/
 void app_main() {
-    
+
     /* If you want to use a task to create the graphic, you NEED to create a Pinned task
      * Otherwise there can be problem such as memory corruption and so on.
      * NOTE: When not using Wi-Fi nor Bluetooth you can pin the guiTask to core 0 */
@@ -73,20 +73,22 @@ void app_main() {
 SemaphoreHandle_t xGuiSemaphore;
 
 static void guiTask(void *pvParameter) {
-    
+
     (void) pvParameter;
     xGuiSemaphore = xSemaphoreCreateMutex();
 
     lv_init();
-    
+
     /* Initialize SPI or I2C bus used by the drivers */
     lvgl_driver_init();
 
-    static lv_color_t buf1[DISP_BUF_SIZE];
+    lv_color_t* buf1 = heap_caps_malloc(DISP_BUF_SIZE * sizeof(lv_color_t), MALLOC_CAP_DMA);
+    assert(buf1 != NULL);
 
     /* Use double buffered when not working with monochrome displays */
 #ifndef CONFIG_LV_TFT_DISPLAY_MONOCHROME
-    static lv_color_t buf2[DISP_BUF_SIZE];
+    lv_color_t* buf2 = heap_caps_malloc(DISP_BUF_SIZE * sizeof(lv_color_t), MALLOC_CAP_DMA);
+    assert(buf2 != NULL);
 #else
     static lv_color_t *buf2 = NULL;
 #endif
@@ -95,10 +97,11 @@ static void guiTask(void *pvParameter) {
 
     uint32_t size_in_px = DISP_BUF_SIZE;
 
-#if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_IL3820 \
-    || defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A \
-    || defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D
-    
+#if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_IL3820         \
+    || defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A    \
+    || defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D     \
+    || defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306
+
     /* Actual size in pixels, not bytes. */
     size_in_px *= 8;
 #endif
@@ -130,7 +133,7 @@ static void guiTask(void *pvParameter) {
     indev_drv.type = LV_INDEV_TYPE_POINTER;
     lv_indev_drv_register(&indev_drv);
 #endif
-    
+
     /* Create and start a periodic timer interrupt to call lv_tick_inc */
     const esp_timer_create_args_t periodic_timer_args = {
         .callback = &lv_tick_task,
@@ -142,7 +145,7 @@ static void guiTask(void *pvParameter) {
 
     /* Create the demo application */
     create_demo_application();
-    
+
     while (1) {
         /* Delay 1 tick (assumes FreeRTOS tick is 10ms */
         vTaskDelay(pdMS_TO_TICKS(10));
@@ -155,16 +158,20 @@ static void guiTask(void *pvParameter) {
     }
 
     /* A task should NEVER return */
+    free(buf1);
+#ifndef CONFIG_LV_TFT_DISPLAY_MONOCHROME
+    free(buf2);
+#endif
     vTaskDelete(NULL);
 }
 
 static void create_demo_application(void)
 {
-    /* When using a monochrome display we only show "Hello World" centered on the 
+    /* When using a monochrome display we only show "Hello World" centered on the
      * screen */
 #if defined CONFIG_LV_TFT_DISPLAY_MONOCHROME || \
     defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S
-    
+
     /* use a pretty small demo for monochrome displays */
     /* Get the current screen  */
     lv_obj_t * scr = lv_disp_get_scr_act(NULL);