Skip to content

Commit efdbf4c

Browse files
committed
Merge branch 'fix/fixed_ci_error_for_usb_cdc_4g_module' into 'master'
fix(example): fixed the CI compilation error of the usb_cdc 4g module example See merge request ae_group/esp-iot-solution!1378
2 parents 5581067 + a7df4f1 commit efdbf4c

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.gitlab/ci/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,6 @@ build_example_usb_host_usb_cdc_4g_module:
942942
- .build_idf_version_greater_equal_v5_0
943943
variables:
944944
EXAMPLE_DIR: examples/usb/host/usb_cdc_4g_module
945-
allow_failure: true # Temporarily disable build CI check, remove this line to restore strict checking after issues are fixed
946945

947946
build_example_usb_host_usb_cdc_basic:
948947
extends:

examples/usb/host/usb_cdc_4g_module/main/app_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ static void _system_dump()
109109

110110
static void _led_indicator_init()
111111
{
112+
esp_err_t ret = ESP_OK;
112113
led_indicator_gpio_config_t led_indicator_gpio_config = {
113114
.is_active_level_high = LED_ACTIVE_LEVEL,
114115
};
@@ -120,7 +121,7 @@ static void _led_indicator_init()
120121

121122
if (LED_RED_SYSTEM_GPIO) {
122123
led_indicator_gpio_config.gpio_num = LED_RED_SYSTEM_GPIO;
123-
esp_err_t ret = led_indicator_new_gpio_device(&led_config, &led_indicator_gpio_config, &s_led_system_handle);
124+
ret = led_indicator_new_gpio_device(&led_config, &led_indicator_gpio_config, &s_led_system_handle);
124125
ESP_ERROR_CHECK(ret);
125126
assert(s_led_system_handle != NULL);
126127
}

examples/usb/host/usb_cdc_4g_module/main/idf_component.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dependencies:
22
idf: ">=4.4.1"
33
cmake_utilities: "0.*"
44
led_indicator:
5-
version: "~0.3.0"
5+
override_path: "../../../../../components/led/led_indicator"
66
json_parser:
77
version: "1.0.3"
88
iot_usbh_modem:
@@ -13,8 +13,6 @@ dependencies:
1313
rules:
1414
- if: "target in [esp32p4]"
1515
espressif/esp32_s3_usb_otg:
16-
version: "^1.5.1"
16+
version: "^2.0"
1717
rules:
1818
- if: "target in [esp32s3]"
19-
lvgl/lvgl: #temp to workaround bsp issue
20-
version: "9.2.0"

0 commit comments

Comments
 (0)