Merge pull request #686 from espressif/fix/lvgl_port_deinit_caps

fix(lvgl_port): Fixed deinitialization of the task which was created with caps + lv_deinit()

Author: espzav

components/esp_lvgl_port/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Fixes
+- Fixed deinitialization of the task which was created with caps - https://github.com/espressif/esp-bsp/issues/680
+- Call lv_deinit() - https://github.com/espressif/esp-bsp/issues/635
+
 ## 2.7.0
 
 ### Features

components/esp_lvgl_port/examples/rgb_lcd/main/main.c

@@ -103,7 +103,11 @@ static esp_err_t app_lcd_init(void)
         .dma_burst_size = 64,
 #endif
         .data_width = 16,
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6,0,0)
+        .in_color_format = LCD_COLOR_FMT_RGB565,
+#else
         .bits_per_pixel = 16,
+#endif
         .de_gpio_num = EXAMPLE_LCD_GPIO_DE,
         .pclk_gpio_num = EXAMPLE_LCD_GPIO_PCLK,
         .vsync_gpio_num = EXAMPLE_LCD_GPIO_VSYNC,

components/esp_lvgl_port/src/lvgl9/esp_lvgl_port.c

@@ -252,7 +252,7 @@ static void lvgl_port_task(void *arg)
     lvgl_port_task_deinit();
 
     /* Close task */
-    vTaskDelete( NULL );
+    vTaskDeleteWithCaps( NULL );
 }
 
 static void lvgl_port_task_deinit(void)
@@ -274,10 +274,9 @@ static void lvgl_port_task_deinit(void)
         vEventGroupDelete(lvgl_port_ctx.lvgl_events);
     }
     memset(&lvgl_port_ctx, 0, sizeof(lvgl_port_ctx));
-#if LV_ENABLE_GC || !LV_MEM_CUSTOM
+
     /* Deinitialize LVGL */
     lv_deinit();
-#endif
 }
 
 static void lvgl_port_tick_increment(void *arg)

components/esp_lvgl_port/test_apps/lvgl_port/main/test.c

@@ -209,10 +209,11 @@ static esp_err_t app_touch_deinit(void)
     return ESP_OK;
 }
 
-static esp_err_t app_lvgl_init(void)
+static esp_err_t app_lvgl_init(int task_affinity)
 {
     /* Initialize LVGL */
-    const lvgl_port_cfg_t lvgl_cfg = ESP_LVGL_PORT_INIT_CONFIG();
+    lvgl_port_cfg_t lvgl_cfg = ESP_LVGL_PORT_INIT_CONFIG();
+    lvgl_cfg.task_affinity = task_affinity;
     ESP_RETURN_ON_ERROR(lvgl_port_init(&lvgl_cfg), TAG, "LVGL port initialization failed");
 
     /* Add LCD screen */
@@ -306,7 +307,7 @@ static void app_main_display(void)
 }
 
 // Some resources are lazy allocated in the LCD driver, the threadhold is left for that case
-#define TEST_MEMORY_LEAK_THRESHOLD (50)
+#define TEST_MEMORY_LEAK_THRESHOLD (200)
 
 static void check_leak(size_t start_free, size_t end_free, const char *type)
 {
@@ -333,8 +334,8 @@ TEST_CASE("Main test LVGL port", "[lvgl port]")
 
     ESP_LOGI(TAG, "Initilize LVGL.");
 
-    /* LVGL initialization */
-    TEST_ASSERT_EQUAL(app_lvgl_init(), ESP_OK);
+    /* LVGL initialization - no task affinity */
+    TEST_ASSERT_EQUAL(app_lvgl_init(-1), ESP_OK);
 
     /* Show LVGL objects */
     app_main_display();
@@ -349,11 +350,36 @@ TEST_CASE("Main test LVGL port", "[lvgl port]")
 
     ESP_LOGI(TAG, "LVGL deinitialized.");
 
+    esp_reent_cleanup();
     size_t end_lvgl_freemem_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT);
     size_t end_lvgl_freemem_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT);
     check_leak(start_lvgl_freemem_8bit, end_lvgl_freemem_8bit, "8BIT LVGL");
     check_leak(start_lvgl_freemem_32bit, end_lvgl_freemem_32bit, "32BIT LVGL");
 
+    ESP_LOGI(TAG, "Initilize LVGL - task affinity to core 1");
+
+    /* LVGL initialization - task affinity to core 1 */
+    TEST_ASSERT_EQUAL(app_lvgl_init(1), ESP_OK);
+
+    /* Show LVGL objects */
+    app_main_display();
+
+    vTaskDelay(5000 / portTICK_PERIOD_MS);
+
+    /* LVGL deinit */
+    TEST_ASSERT_EQUAL(app_lvgl_deinit(), ESP_OK);
+
+    /* When using LVGL8, it takes some time to release all memory */
+    vTaskDelay(1000 / portTICK_PERIOD_MS);
+
+    ESP_LOGI(TAG, "LVGL deinitialized.");
+
+    esp_reent_cleanup();
+    end_lvgl_freemem_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT);
+    end_lvgl_freemem_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT);
+    check_leak(start_lvgl_freemem_8bit, end_lvgl_freemem_8bit, "8BIT LVGL");
+    check_leak(start_lvgl_freemem_32bit, end_lvgl_freemem_32bit, "32BIT LVGL");
+
     /* Touch deinit */
     TEST_ASSERT_EQUAL(app_touch_deinit(), ESP_OK);
 
@@ -364,6 +390,7 @@ TEST_CASE("Main test LVGL port", "[lvgl port]")
 
     ESP_LOGI(TAG, "LCD deinitilized.");
 
+    esp_reent_cleanup();
     size_t end_freemem_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT);
     size_t end_freemem_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT);
     check_leak(start_freemem_8bit, end_freemem_8bit, "8BIT");

components/lcd/esp_lcd_gc9503/test_apps/main/test_esp_lcd_gc9503.c

@@ -28,6 +28,7 @@
 #define TEST_LCD_V_RES              (480)
 #define TEST_LCD_BIT_PER_PIXEL      (18)
 #define TEST_RGB_BIT_PER_PIXEL      (16)
+#define TEST_LCD_IN_COLOR_FORMAT    (LCD_COLOR_FMT_RGB565)
 #define TEST_LCD_DATA_WIDTH         (16)
 
 #define TEST_LCD_IO_RGB_DISP        (GPIO_NUM_NC)
@@ -111,7 +112,11 @@ TEST_CASE("test gc9503 to draw color bar with RGB interface, using GPIO", "[gc95
         .dma_burst_size = 64,
 #endif
         .data_width = TEST_LCD_DATA_WIDTH,
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6,0,0)
+        .in_color_format = TEST_LCD_IN_COLOR_FORMAT,
+#else
         .bits_per_pixel = TEST_RGB_BIT_PER_PIXEL,
+#endif
         .de_gpio_num = TEST_LCD_IO_RGB_DE,
         .pclk_gpio_num = TEST_LCD_IO_RGB_PCLK,
         .vsync_gpio_num = TEST_LCD_IO_RGB_VSYNC,
@@ -200,7 +205,11 @@ TEST_CASE("test gc9503 to draw color bar with RGB interface, using IO expander",
         .dma_burst_size = 64,
 #endif
         .data_width = TEST_LCD_DATA_WIDTH,
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6,0,0)
+        .in_color_format = TEST_LCD_IN_COLOR_FORMAT,
+#else
         .bits_per_pixel = TEST_RGB_BIT_PER_PIXEL,
+#endif
         .de_gpio_num = TEST_LCD_IO_RGB_DE,
         .pclk_gpio_num = TEST_LCD_IO_RGB_PCLK,
         .vsync_gpio_num = TEST_LCD_IO_RGB_VSYNC,