feat(lvgl): Update to LVGL v9.2.2 (#379)

finger563 · web-flow · commit da990cd18b96 · 2025-02-21T11:05:03.000-06:00
* Update LVGL submodule to 9.2.2
* Update display to use public APIs instead of private APIs
* Update affected examples to use public APIs instead of private APIs
* Update t-dongle to have proper color and display offset configuration
diff --git a/components/display/include/display.hpp b/components/display/include/display.hpp
@@ -239,9 +239,7 @@ template <typename Pixel> class Display : public BaseComponent {
    */
   void force_refresh() const {
     auto disp = lv_display_get_default();
-    // lv_refr_now(disp);
-    lv_area_t area = {.x1 = 0, .y1 = 0, .x2 = (int16_t)width_, .y2 = (int16_t)height_};
-    _lv_inv_area(disp, &area);
+    lv_obj_invalidate(lv_scr_act());
   }
 
   /**
@@ -273,7 +271,7 @@ template <typename Pixel> class Display : public BaseComponent {
    * @brief LVGL event handler.
    */
   static void event_cb(lv_event_t *event) {
-    if (event->code == LV_EVENT_RESOLUTION_CHANGED) {
+    if (lv_event_get_code(event) == LV_EVENT_RESOLUTION_CHANGED) {
       auto rotation = lv_display_get_rotation(lv_display_get_default());
       auto rotation_callback = reinterpret_cast<rotation_fn>(lv_event_get_user_data(event));
       if (rotation_callback != nullptr) {
diff --git a/components/display_drivers/example/main/display_drivers_example.cpp b/components/display_drivers/example/main/display_drivers_example.cpp
@@ -61,7 +61,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_display_get_default();
     lv_display_flush_ready(disp);
   }
 }
diff --git a/components/esp-box/example/main/esp_box_example.cpp b/components/esp-box/example/main/esp_box_example.cpp
@@ -107,7 +107,7 @@ extern "C" void app_main(void) {
         clear_circles();
         static auto rotation = LV_DISPLAY_ROTATION_0;
         rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);
-        lv_display_t *disp = _lv_refr_get_disp_refreshing();
+        lv_display_t *disp = lv_display_get_default();
         lv_disp_set_rotation(disp, rotation);
       },
       LV_EVENT_PRESSED, nullptr);
diff --git a/components/esp-box/src/video.cpp b/components/esp-box/src/video.cpp
@@ -29,7 +29,7 @@ static void lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_display_get_default();
     lv_display_flush_ready(disp);
   }
 }
diff --git a/components/lvgl b/components/lvgl
@@ -1 +1 @@
-Subproject commit e1c0b21b2723d391b885de4b2ee5cc997eccca91
+Subproject commit 7f07a129e8d77f4984fff8e623fd5be18ff42e74
diff --git a/components/matouch-rotary-display/example/main/matouch_rotary_display_example.cpp b/components/matouch-rotary-display/example/main/matouch_rotary_display_example.cpp
@@ -108,7 +108,7 @@ extern "C" void app_main(void) {
         clear_circles();
         static auto rotation = LV_DISPLAY_ROTATION_0;
         rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);
-        lv_display_t *disp = _lv_refr_get_disp_refreshing();
+        lv_display_t *disp = lv_display_get_default();
         lv_disp_set_rotation(disp, rotation);
       },
       LV_EVENT_PRESSED, nullptr);
diff --git a/components/matouch-rotary-display/src/matouch-rotary-display.cpp b/components/matouch-rotary-display/src/matouch-rotary-display.cpp
@@ -226,7 +226,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_display_get_default();
     lv_display_flush_ready(disp);
   }
 }
diff --git a/components/seeed-studio-round-display/example/main/seeed_studio_round_display_example.cpp b/components/seeed-studio-round-display/example/main/seeed_studio_round_display_example.cpp
@@ -145,7 +145,7 @@ static void on_rotate_pressed(lv_event_t *event) {
   std::lock_guard<std::recursive_mutex> lock(lvgl_mutex);
   static auto rotation = LV_DISPLAY_ROTATION_0;
   rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);
-  lv_display_t *disp = _lv_refr_get_disp_refreshing();
+  lv_display_t *disp = lv_display_get_default();
   lv_disp_set_rotation(disp, rotation);
 }
 
diff --git a/components/seeed-studio-round-display/src/seeed-studio-round-display.cpp b/components/seeed-studio-round-display/src/seeed-studio-round-display.cpp
@@ -186,7 +186,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_display_get_default();
     lv_display_flush_ready(disp);
   }
 }
diff --git a/components/t-deck/example/main/t_deck_example.cpp b/components/t-deck/example/main/t_deck_example.cpp
@@ -34,7 +34,7 @@ extern "C" void app_main(void) {
       std::lock_guard<std::recursive_mutex> lock(lvgl_mutex);
       clear_circles();
       rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);
-      lv_display_t *disp = _lv_refr_get_disp_refreshing();
+      lv_display_t *disp = lv_display_get_default();
       lv_disp_set_rotation(disp, rotation);
     }
   };
@@ -117,7 +117,7 @@ extern "C" void app_main(void) {
         std::lock_guard<std::recursive_mutex> lock(lvgl_mutex);
         clear_circles();
         rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);
-        lv_display_t *disp = _lv_refr_get_disp_refreshing();
+        lv_display_t *disp = lv_display_get_default();
         lv_disp_set_rotation(disp, rotation);
       },
       LV_EVENT_PRESSED, nullptr);
diff --git a/components/t-deck/src/t-deck.cpp b/components/t-deck/src/t-deck.cpp
@@ -256,7 +256,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_display_get_default();
     lv_display_flush_ready(disp);
   }
 }
diff --git a/components/t-dongle-s3/example/main/t_dongle_s3_example.cpp b/components/t-dongle-s3/example/main/t_dongle_s3_example.cpp
@@ -47,7 +47,7 @@ extern "C" void app_main(void) {
       static auto rotation = LV_DISPLAY_ROTATION_0;
       rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);
       fmt::print("Setting rotation to {}\n", (int)rotation);
-      lv_display_t *disp = _lv_refr_get_disp_refreshing();
+      lv_display_t *disp = lv_disp_get_default();
       lv_disp_set_rotation(disp, rotation);
     }
   };
diff --git a/components/t-dongle-s3/include/t-dongle-s3.hpp b/components/t-dongle-s3/include/t-dongle-s3.hpp
@@ -219,10 +219,11 @@ class TDongleS3 : public BaseComponent {
   static constexpr gpio_num_t lcd_reset_io = GPIO_NUM_1;
   static constexpr gpio_num_t lcd_dc_io = GPIO_NUM_2;
   static constexpr int lcd_offset_x = 26;
-  static constexpr int lcd_offset_y = 0;
+  static constexpr int lcd_offset_y = 1;
   static constexpr bool backlight_value = false;
   static constexpr bool reset_value = false;
   static constexpr bool invert_colors = false;
+  static constexpr bool swap_color_order = true;
   static constexpr auto rotation = espp::DisplayRotation::PORTRAIT;
   static constexpr bool swap_xy = false;
   static constexpr bool mirror_x = false;
diff --git a/components/t-dongle-s3/src/t-dongle-s3.cpp b/components/t-dongle-s3/src/t-dongle-s3.cpp
@@ -139,7 +139,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_disp_get_default();
     lv_display_flush_ready(disp);
   }
 }
@@ -185,6 +185,7 @@ bool TDongleS3::initialize_lcd() {
       .data_command_pin = lcd_dc_io,
       .reset_value = reset_value,
       .invert_colors = invert_colors,
+      .swap_color_order = swap_color_order,
       .offset_x = lcd_offset_x,
       .offset_y = lcd_offset_y,
       .swap_xy = swap_xy,
diff --git a/components/wrover-kit/example/main/wrover_kit_example.cpp b/components/wrover-kit/example/main/wrover_kit_example.cpp
@@ -50,7 +50,7 @@ extern "C" void app_main(void) {
                                              rotation = static_cast<lv_display_rotation_t>(
                                                  (static_cast<int>(rotation) + 1) % 4);
                                              fmt::print("Setting rotation to {}\n", (int)rotation);
-                                             lv_display_t *disp = _lv_refr_get_disp_refreshing();
+                                             lv_display_t *disp = lv_display_get_default();
                                              lv_disp_set_rotation(disp, rotation);
                                            }
                                          },
diff --git a/components/wrover-kit/src/wrover-kit.cpp b/components/wrover-kit/src/wrover-kit.cpp
@@ -32,7 +32,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {
   uint16_t user_flags = (uint32_t)(t->user);
   bool should_flush = user_flags & FLUSH_BIT;
   if (should_flush) {
-    lv_display_t *disp = _lv_refr_get_disp_refreshing();
+    lv_display_t *disp = lv_display_get_default();
     lv_display_flush_ready(disp);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {`
`61`	`61`	`uint16_t user_flags = (uint32_t)(t->user);`
`62`	`62`	`bool should_flush = user_flags & FLUSH_BIT;`
`63`	`63`	`if (should_flush) {`
`64`		`- lv_display_t *disp = _lv_refr_get_disp_refreshing();`
	`64`	`+ lv_display_t *disp = lv_display_get_default();`
`65`	`65`	`lv_display_flush_ready(disp);`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static void lcd_spi_post_transfer_callback(spi_transaction_t *t) {`
`29`	`29`	`uint16_t user_flags = (uint32_t)(t->user);`
`30`	`30`	`bool should_flush = user_flags & FLUSH_BIT;`
`31`	`31`	`if (should_flush) {`
`32`		`- lv_display_t *disp = _lv_refr_get_disp_refreshing();`
	`32`	`+ lv_display_t *disp = lv_display_get_default();`
`33`	`33`	`lv_display_flush_ready(disp);`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {`
`226`	`226`	`uint16_t user_flags = (uint32_t)(t->user);`
`227`	`227`	`bool should_flush = user_flags & FLUSH_BIT;`
`228`	`228`	`if (should_flush) {`
`229`		`- lv_display_t *disp = _lv_refr_get_disp_refreshing();`
	`229`	`+ lv_display_t *disp = lv_display_get_default();`
`230`	`230`	`lv_display_flush_ready(disp);`
`231`	`231`	`}`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static void on_rotate_pressed(lv_event_t *event) {`
`145`	`145`	`std::lock_guard<std::recursive_mutex> lock(lvgl_mutex);`
`146`	`146`	`static auto rotation = LV_DISPLAY_ROTATION_0;`
`147`	`147`	`rotation = static_cast<lv_display_rotation_t>((static_cast<int>(rotation) + 1) % 4);`
`148`		`- lv_display_t *disp = _lv_refr_get_disp_refreshing();`
	`148`	`+ lv_display_t *disp = lv_display_get_default();`
`149`	`149`	`lv_disp_set_rotation(disp, rotation);`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ static void IRAM_ATTR lcd_spi_post_transfer_callback(spi_transaction_t *t) {`
`186`	`186`	`uint16_t user_flags = (uint32_t)(t->user);`
`187`	`187`	`bool should_flush = user_flags & FLUSH_BIT;`
`188`	`188`	`if (should_flush) {`
`189`		`- lv_display_t *disp = _lv_refr_get_disp_refreshing();`
	`189`	`+ lv_display_t *disp = lv_display_get_default();`
`190`	`190`	`lv_display_flush_ready(disp);`
`191`	`191`	`}`
`192`	`192`	`}`