Commit 2c138811 authored by Xu Xin's avatar Xu Xin

fixed(CI): Add build version.

parent 6881ee0f
...@@ -59,6 +59,7 @@ build_example_chatgpt_demo: ...@@ -59,6 +59,7 @@ build_example_chatgpt_demo:
parallel: parallel:
matrix: matrix:
- IMAGE: espressif/idf:release-v5.0 - IMAGE: espressif/idf:release-v5.0
- IMAGE: espressif/idf:release-v5.1
- IMAGE: espressif/idf:latest - IMAGE: espressif/idf:latest
variables: variables:
EXAMPLE_DIR: examples/chatgpt_demo EXAMPLE_DIR: examples/chatgpt_demo
...@@ -75,6 +76,7 @@ build_example_chatgpt_demo_factory_nvs: ...@@ -75,6 +76,7 @@ build_example_chatgpt_demo_factory_nvs:
parallel: parallel:
matrix: matrix:
- IMAGE: espressif/idf:release-v5.0 - IMAGE: espressif/idf:release-v5.0
- IMAGE: espressif/idf:release-v5.1
- IMAGE: espressif/idf:latest - IMAGE: espressif/idf:latest
variables: variables:
EXAMPLE_DIR: examples/chatgpt_demo/factory_nvs EXAMPLE_DIR: examples/chatgpt_demo/factory_nvs
...@@ -135,7 +137,7 @@ build_example_usb_camera_lcd_display: ...@@ -135,7 +137,7 @@ build_example_usb_camera_lcd_display:
matrix: matrix:
- IMAGE: espressif/idf:release-v5.0 - IMAGE: espressif/idf:release-v5.0
- IMAGE: espressif/idf:release-v5.1 - IMAGE: espressif/idf:release-v5.1
# - IMAGE: espressif/idf:latest - IMAGE: espressif/idf:latest
variables: variables:
EXAMPLE_DIR: examples/usb_camera_lcd_display EXAMPLE_DIR: examples/usb_camera_lcd_display
...@@ -156,6 +158,7 @@ build_example_usb_headset: ...@@ -156,6 +158,7 @@ build_example_usb_headset:
parallel: parallel:
matrix: matrix:
- IMAGE: espressif/idf:release-v5.2 - IMAGE: espressif/idf:release-v5.2
- IMAGE: espressif/idf:release-v5.1
- IMAGE: espressif/idf:latest - IMAGE: espressif/idf:latest
variables: variables:
EXAMPLE_DIR: examples/usb_headset EXAMPLE_DIR: examples/usb_headset
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3) #if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3)
#include "hal/usb_wrap_ll.h" #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 #else
#include "hal/usb_phy_ll.h" #include "hal/usb_phy_ll.h"
#endif #endif
...@@ -22,6 +24,8 @@ void EventBtnSetupClick(lv_event_t *e) ...@@ -22,6 +24,8 @@ void EventBtnSetupClick(lv_event_t *e)
#if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3) #if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR == 3)
usb_wrap_ll_phy_enable_external(&USB_WRAP, true); 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 #else
usb_phy_ll_int_jtag_enable(&USB_SERIAL_JTAG); usb_phy_ll_int_jtag_enable(&USB_SERIAL_JTAG);
#endif #endif
......
...@@ -2,5 +2,9 @@ ...@@ -2,5 +2,9 @@
# in this exact order for cmake to work correctly # in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
set(EXTRA_COMPONENT_DIRS
../../components
)
include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(usb_camera_lcd_display) project(usb_camera_lcd_display)
dependencies: dependencies:
espressif/esp-box-3: "^1.0.0"
idf: ">=5.0" idf: ">=5.0"
usb_stream: usb_stream:
version: "~1.3.*" version: "~1.3.*"
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment