Merge pull request espressif#367 from espressif/fix/lvgl_port_fix_eve…

…nt_v9.2 LVGL port: Fix event user data for using with LVGL v9.2
jeetrohan · Aug 13, 2024 · d4e80fd · d4e80fd
2 parents c801e60 + 641c0f2
commit d4e80fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/components/esp_lvgl_port/CHANGELOG.md b/components/esp_lvgl_port/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Changelog
 
 ## 2.3.1
+
+### Fixes
 - Fixed LVGL version resolution if LVGL is not a managed component
 - Fixed link error with LVGL v9.2
+- Fixed event error with LVGL v9.2
 
 ## 2.3.0
+
+### Fixes
 - Fixed LVGL port for using with LVGL9 OS FreeRTOS enabled
 - Fixed bad handled touch due to synchronization timer task
 

diff --git a/components/esp_lvgl_port/idf_component.yml b/components/esp_lvgl_port/idf_component.yml
@@ -1,4 +1,4 @@
-version: "2.3.0"
+version: "2.3.1"
 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/lvgl9/esp_lvgl_port_disp.c b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_disp.c
@@ -579,7 +579,7 @@ static void lvgl_port_disp_rotation_update(lvgl_port_display_ctx_t *disp_ctx)
 static void lvgl_port_disp_size_update_callback(lv_event_t *e)
 {
     assert(e);
-    lvgl_port_display_ctx_t *disp_ctx = (lvgl_port_display_ctx_t *)e->user_data;
+    lvgl_port_display_ctx_t *disp_ctx = (lvgl_port_display_ctx_t *)lv_event_get_user_data(e);
     lvgl_port_disp_rotation_update(disp_ctx);
 }
 

diff --git a/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_lcd_ev_board b/examples/display_lvgl_demos/sdkconfig.bsp.esp32_s3_lcd_ev_board
@@ -20,6 +20,7 @@ CONFIG_BSP_DISPLAY_LVGL_DIRECT_MODE=y
 CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y
 CONFIG_LV_FONT_MONTSERRAT_12=y
 CONFIG_LV_FONT_MONTSERRAT_16=y
+CONFIG_LV_FONT_MONTSERRAT_24=y
 CONFIG_LV_USE_DEMO_WIDGETS=y
 CONFIG_LV_USE_DEMO_BENCHMARK=y
 CONFIG_LV_USE_DEMO_STRESS=y