Merge pull request #339 from espressif/fix/lvgl_port_idf4.4.3

fix(esp_lvgl_port): Fixed missing callback in IDF4.4.3 and lower
espressif · Jun 12, 2024 · 5c7b366 · 5c7b366
2 parents 8d403e7 + f59d5ff
commit 5c7b366
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/components/esp_lvgl_port/CHANGELOG.md b/components/esp_lvgl_port/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.2
+
+### Fixes
+- Fixed missing callback in IDF4.4.3 and lower for LVGL port
+
 ## 2.2.1
 
 ### Fixes

diff --git a/components/esp_lvgl_port/idf_component.yml b/components/esp_lvgl_port/idf_component.yml
@@ -1,4 +1,4 @@
-version: "2.2.1"
+version: "2.2.2"
 description: ESP LVGL port
 url: https://github.com/espressif/esp-bsp/tree/master/components/esp_lvgl_port
 dependencies:

diff --git a/components/esp_lvgl_port/src/lvgl8/esp_lvgl_port_disp.c b/components/esp_lvgl_port/src/lvgl8/esp_lvgl_port_disp.c
@@ -82,11 +82,14 @@ lv_disp_t *lvgl_port_add_disp(const lvgl_port_display_cfg_t *disp_cfg)
         disp_ctx->disp_type = LVGL_PORT_DISP_TYPE_OTHER;
 
         assert(disp_ctx->io_handle != NULL);
+
+#if LVGL_PORT_HANDLE_FLUSH_READY
         const esp_lcd_panel_io_callbacks_t cbs = {
             .on_color_trans_done = lvgl_port_flush_io_ready_callback,
         };
         /* Register done callback */
         esp_lcd_panel_io_register_event_callbacks(disp_ctx->io_handle, &cbs, &disp_ctx->disp_drv);
+#endif
     }
 
     return disp;

diff --git a/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c
@@ -86,11 +86,14 @@ lv_display_t *lvgl_port_add_disp(const lvgl_port_display_cfg_t *disp_cfg)
         disp_ctx->disp_type = LVGL_PORT_DISP_TYPE_OTHER;
 
         assert(disp_cfg->io_handle != NULL);
+
+#if LVGL_PORT_HANDLE_FLUSH_READY
         const esp_lcd_panel_io_callbacks_t cbs = {
             .on_color_trans_done = lvgl_port_flush_io_ready_callback,
         };
         /* Register done callback */
         esp_lcd_panel_io_register_event_callbacks(disp_ctx->io_handle, &cbs, disp);
+#endif
 
         /* Apply rotation from initial display configuration */
         lvgl_port_disp_rotation_update(disp_ctx);

diff --git a/examples/display/main/idf_component.yml b/examples/display/main/idf_component.yml
@@ -2,5 +2,5 @@ description: BSP Display example
 
 dependencies:
   esp_wrover_kit:
-    version: "^1.0.0"
+    version: "*"
     override_path: "../../../bsp/esp_wrover_kit"
diff --git a/examples/generic_button_led/main/idf_component.yml b/examples/generic_button_led/main/idf_component.yml
@@ -2,5 +2,5 @@ description: BSP Display example
 
 dependencies:
   esp_bsp_generic:
-    version: "^1.0.0"
+    version: "*"
     override_path: "../../../bsp/esp_bsp_generic"