Merge branch 'feature/update_CI_version' into 'master'

fixed(CI): Add build version. See merge request ae_group/esp-box!106
espressif · Mar 22, 2024 · 78531c7 · 78531c7
2 parents 6881ee0 + 2c13881
commit 78531c7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -59,6 +59,7 @@ build_example_chatgpt_demo:
   parallel:
     matrix:
       - IMAGE: espressif/idf:release-v5.0
+      - IMAGE: espressif/idf:release-v5.1
       - IMAGE: espressif/idf:latest
   variables:
     EXAMPLE_DIR: examples/chatgpt_demo
@@ -75,6 +76,7 @@ build_example_chatgpt_demo_factory_nvs:
   parallel:
     matrix:
       - IMAGE: espressif/idf:release-v5.0
+      - IMAGE: espressif/idf:release-v5.1
       - IMAGE: espressif/idf:latest
   variables:
     EXAMPLE_DIR: examples/chatgpt_demo/factory_nvs
@@ -135,7 +137,7 @@ build_example_usb_camera_lcd_display:
     matrix:
       - IMAGE: espressif/idf:release-v5.0
       - IMAGE: espressif/idf:release-v5.1
-      # - IMAGE: espressif/idf:latest
+      - IMAGE: espressif/idf:latest
   variables:
     EXAMPLE_DIR: examples/usb_camera_lcd_display
 
@@ -156,6 +158,7 @@ build_example_usb_headset:
   parallel:
     matrix:
       - IMAGE: espressif/idf:release-v5.2
+      - IMAGE: espressif/idf:release-v5.1
       - IMAGE: espressif/idf:latest
   variables:
     EXAMPLE_DIR: examples/usb_headset

diff --git a/examples/chatgpt_demo/factory_nvs/main/app/app_ui_events.c b/examples/chatgpt_demo/factory_nvs/main/app/app_ui_events.c
@@ -9,6 +9,8 @@
 
 #if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3)
 #include "hal/usb_wrap_ll.h"
+#elif (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 1)
+#include "hal/usb_fsls_phy_ll.h"
 #else
 #include "hal/usb_phy_ll.h"
 #endif
@@ -22,6 +24,8 @@ void EventBtnSetupClick(lv_event_t *e)
 
 #if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3)
     usb_wrap_ll_phy_enable_external(&USB_WRAP, true);
+#elif (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 1)
+    usb_fsls_phy_ll_int_jtag_enable(&USB_SERIAL_JTAG);
 #else
     usb_phy_ll_int_jtag_enable(&USB_SERIAL_JTAG);
 #endif

diff --git a/examples/usb_camera_lcd_display/CMakeLists.txt b/examples/usb_camera_lcd_display/CMakeLists.txt
@@ -2,5 +2,9 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
+set(EXTRA_COMPONENT_DIRS
+    ../../components
+    )
+
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(usb_camera_lcd_display)
diff --git a/examples/usb_camera_lcd_display/main/idf_component.yml b/examples/usb_camera_lcd_display/main/idf_component.yml
@@ -1,5 +1,4 @@
 dependencies:
-  espressif/esp-box-3: "^1.0.0"
   idf: ">=5.0"
   usb_stream:
-    version: "~1.3.*"
+    version: "~1.3.*"