LVGL: Add support of LVGL9 into LVGL port

espressif · Jan 23, 2024 · e1a25c4 · e1a25c4
1 parent 8a04228
commit e1a25c4
Show file tree

Hide file tree

Showing 23 changed files with 3,048 additions and 1,384 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -20,6 +20,12 @@ jobs:
     runs-on: ubuntu-20.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
+      - name: Upgrade component manager
+        shell: bash
+        run: |
+          . ${IDF_PATH}/export.sh
+          pip install idf-component-manager --upgrade
+
       - uses: actions/checkout@v3
       - name: Build ESP-BSP Test Application
         env:

diff --git a/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h b/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h
@@ -16,6 +16,7 @@
 #include "driver/i2s_pdm.h"
 #include "iot_button.h"
 #include "lvgl.h"
+#include "esp_lvgl_port.h"
 #include "esp_codec_dev.h"
 
 /**************************************************************************************************

diff --git a/components/esp_lvgl_port/CMakeLists.txt b/components/esp_lvgl_port/CMakeLists.txt
@@ -1,29 +1,61 @@
-file(GLOB_RECURSE IMAGE_SOURCES images/*.c)
 
-idf_component_register(SRCS "esp_lvgl_port.c" ${IMAGE_SOURCES} INCLUDE_DIRS "include" REQUIRES "esp_lcd" PRIV_REQUIRES "esp_timer")
+#Get LVGL version
+idf_component_get_property(lvgl_ver lvgl__lvgl COMPONENT_VERSION)
+message(STATUS "Component version: ${lvgl_ver}")
+
+#Select folder by LVGL version
+if(lvgl_ver LESS "9.0.0")
+    message(STATUS "Compiling LVGL8")
+    set(PORT_FOLDER "lvgl8")
+else()
+    message(STATUS "Compiling LVGL9")
+    set(PORT_FOLDER "lvgl9")
+endif()
+
+set(PORT_PATH "src/${PORT_FOLDER}")
+
+idf_component_register(SRCS "${PORT_PATH}/esp_lvgl_port.c" "${PORT_PATH}/esp_lvgl_port_disp.c" INCLUDE_DIRS "include" REQUIRES "esp_lcd" PRIV_REQUIRES "esp_timer")
+
+set(ADD_SRCS "")
+set(ADD_LIBS "")
 
 idf_build_get_property(build_components BUILD_COMPONENTS)
 if("espressif__button" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::espressif__button)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_button.c")
+    list(APPEND ADD_LIBS idf::espressif__button)
 endif()
 if("button" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::button)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_button.c")
+    list(APPEND ADD_LIBS idf::button)
 endif()
 if("espressif__esp_lcd_touch" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::espressif__esp_lcd_touch)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_touch.c")
+    list(APPEND ADD_LIBS idf::espressif__esp_lcd_touch)
 endif()
 if("esp_lcd_touch" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::esp_lcd_touch)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_touch.c")
+    list(APPEND ADD_LIBS idf::esp_lcd_touch)
 endif()
 if("espressif__knob" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::espressif__knob)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_knob.c")
+    list(APPEND ADD_LIBS idf::espressif__knob)
 endif()
 if("knob" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::knob)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_knob.c")
+    list(APPEND ADD_LIBS idf::knob)
 endif()
 if("espressif__usb_host_hid" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::espressif__usb_host_hid)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_usbhid.c" "images/${PORT_FOLDER}/img_cursor.c")
+    list(APPEND ADD_LIBS idf::espressif__usb_host_hid)
 endif()
 if("usb_host_hid" IN_LIST build_components)
-    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::usb_host_hid)
+    list(APPEND ADD_SRCS "${PORT_PATH}/esp_lvgl_port_usbhid.c" "images/${PORT_FOLDER}/img_cursor.c")
+    list(APPEND ADD_LIBS idf::usb_host_hid)
+endif()
+
+if(ADD_SRCS)
+    target_sources(${COMPONENT_LIB} PRIVATE ${ADD_SRCS})
+endif()
+if(ADD_LIBS)
+    target_link_libraries(${COMPONENT_LIB} PRIVATE ${ADD_LIBS})
 endif()
diff --git a/components/esp_lvgl_port/README.md b/components/esp_lvgl_port/README.md
@@ -13,6 +13,16 @@ This component helps with using LVGL with Espressif's LCD and touch drivers. It
 * Add/remove navigation buttons input (using [`button`](https://github.com/espressif/esp-iot-solution/tree/master/components/button))
 * Add/remove encoder input (using [`knob`](https://github.com/espressif/esp-iot-solution/tree/master/components/knob))
 
+## LVGL Version
+
+This component supports **LVGL8** and **LVGL9**. By default, it selects the latest LVGL version. If you want to use a specific version (e.g. latest LVGL8), you can easily put into `idf_component.yml` in your project like this:
+
+```
+  lvgl/lvgl:
+    version: "^8"
+    public: true
+```
+
 ## Usage
 
 ### Initialization
@@ -53,6 +63,7 @@ Add an LCD screen to the LVGL. It can be called multiple times for adding multip
         },
         .flags = {
             .buff_dma = true,
+            .swap_bytes = false,
         }
     };
     disp_handle = lvgl_port_add_disp(&disp_cfg);
@@ -219,6 +230,7 @@ Every LVGL calls must be protected with these lock/unlock commands:
 ```
 
 ### Rotating screen
+
 LVGL port supports rotation of the display. You can select whether you'd like software rotation or hardware rotation.
 Software rotation requires no additional logic in your `flush_cb` callback.
 
@@ -233,6 +245,7 @@ Rotation mode can be selected in the `lvgl_port_display_cfg_t` structure.
     }
 ```
 Display rotation can be changed at runtime.
+
 ``` c
     lv_disp_set_rotation(disp_handle, LV_DISP_ROT_90);
 ```