Merge branch 'fix/prune_dependencies_for_usb_cdc_4g_module' into 'master'

fix(example): prune dependencies for the usb host example

See merge request ae_group/esp-iot-solution!1384

Author: laride

.gitlab/ci/build.yml

@@ -918,10 +918,7 @@ build_example_usb_host_usb_camera_mic_spk:
   extends:
     - .build_examples_template
     - .rules:build:example_usb_host_usb_camera_mic_spk
-  parallel:
-    matrix:
-      - IMAGE: espressif/idf:release-v4.4
-      - IMAGE: espressif/idf:release-v5.1
+    - .build_idf_version_greater_equal_v5_0
   variables:
     EXAMPLE_DIR: examples/usb/host/usb_camera_mic_spk
 
@@ -984,10 +981,7 @@ build_example_usb_host_usb_msc_ota:
   extends:
     - .build_examples_template
     - .rules:build:example_usb_host_usb_msc_ota
-  parallel:
-    matrix:
-      - IMAGE: espressif/idf:release-v5.0
-      - IMAGE: espressif/idf:release-v5.1
+    - .build_idf_version_greater_equal_v5_0
   variables:
     EXAMPLE_DIR: examples/usb/host/usb_msc_ota
 

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

@@ -1,9 +1,5 @@
 dependencies:
-  idf: ">=4.4.1"
+  idf: ">=5.0"
   usb_stream:
     version: ">=1.0.5"
     override_path: "../../../../../components/usb/usb_stream"
-  espressif/esp32_s3_usb_otg:
-    version: "^1.5.1"
-    rules:
-      - if: "target in [esp32s3]"

examples/usb/host/usb_camera_mic_spk/main/main.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -11,12 +11,10 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/event_groups.h"
 #include "freertos/task.h"
+#include "driver/gpio.h"
 #include "esp_err.h"
 #include "esp_log.h"
 #include "usb_stream.h"
-#ifdef CONFIG_ESP32_S3_USB_OTG
-#include "bsp/esp-bsp.h"
-#endif
 
 static const char *TAG = "uvc_mic_spk_demo";
 /****************** configure the example working mode *******************************/
@@ -219,8 +217,32 @@ static void stream_state_changed_cb(usb_stream_state_t event, void *arg)
 void app_main(void)
 {
 #ifdef CONFIG_ESP32_S3_USB_OTG
-    bsp_usb_mode_select_host();
-    bsp_usb_host_power_mode(BSP_USB_HOST_POWER_MODE_USB_DEV, true);
+    // USB mode select host
+    const gpio_config_t io_config = {
+        .pin_bit_mask = BIT64(GPIO_NUM_18),
+        .mode = GPIO_MODE_OUTPUT,
+        .pull_up_en = GPIO_PULLUP_DISABLE,
+        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .intr_type = GPIO_INTR_DISABLE
+    };
+    ESP_ERROR_CHECK(gpio_config(&io_config));
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_18, 1));
+
+    // Set host usb dev power mode
+    const gpio_config_t power_io_config = {
+        .pin_bit_mask = BIT64(GPIO_NUM_17) | BIT64(GPIO_NUM_12) | BIT64(GPIO_NUM_13),
+        .mode = GPIO_MODE_OUTPUT,
+        .pull_up_en = GPIO_PULLUP_DISABLE,
+        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .intr_type = GPIO_INTR_DISABLE
+    };
+    ESP_ERROR_CHECK(gpio_config(&power_io_config));
+
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_17, 1)); // Configure the limiter 500mA
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_12, 0));
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_13, 0)); // Turn power off
+    vTaskDelay(pdMS_TO_TICKS(10));
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_12, 1)); // Turn on usb dev power mode
 #endif
     esp_log_level_set("*", ESP_LOG_INFO);
     esp_log_level_set("httpd_txrx", ESP_LOG_INFO);

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

@@ -30,10 +30,6 @@
 #include "ping/ping_sock.h"
 #endif
 
-#ifdef CONFIG_ESP32_S3_USB_OTG
-#include "bsp/esp-bsp.h"
-#endif
-
 static const char *TAG = "4g_main";
 #define LED_RED_SYSTEM_GPIO                 CONFIG_EXAMPLE_LED_RED_SYSTEM_GPIO
 #define LED_BLUE_WIFI_GPIO                  CONFIG_EXAMPLE_LED_BLUE_WIFI_GPIO

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

@@ -1,5 +1,5 @@
 dependencies:
-  idf: ">=4.4.1"
+  idf: ">=5.0"
   cmake_utilities: "0.*"
   led_indicator:
     override_path: "../../../../../components/led/led_indicator"
@@ -12,7 +12,3 @@ dependencies:
     version: "^0.9.0"
     rules:
       - if: "target in [esp32p4]"
-  espressif/esp32_s3_usb_otg:
-    version: "^2.0"
-    rules:
-      - if: "target in [esp32s3]"

examples/usb/host/usb_cdc_4g_module/partitions.csv

@@ -1,14 +1,5 @@
-version: 0.0.1
-targets:
-  - esp32s2
-  - esp32s3
 dependencies:
+  idf: ">=5.0"
   esp_msc_ota:
     version: "*"
     override_path: "../../../../../components/usb/esp_msc_ota"
-  espressif/esp32_s3_usb_otg:
-    version: "^1.5.1"
-    rules:
-      - if: "target in [esp32s3]"
-  lvgl/lvgl: #temp to workaround bsp issue
-    version: "9.2.0"

examples/usb/host/usb_cdc_4g_module/sdkconfig.ci.esp32s3_usb_otg

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -11,9 +11,7 @@
 #include "esp_msc_host.h"
 #include "esp_msc_ota.h"
 #include "usb/usb_host.h"
-#ifdef CONFIG_ESP32_S3_USB_OTG
-#include "bsp/esp-bsp.h"
-#endif
+#include "driver/gpio.h"
 
 static const char *TAG = "usb_msc_ota";
 
@@ -75,8 +73,32 @@ static void msc_ota_event_handler(void *arg, esp_event_base_t event_base,
 void app_main(void)
 {
 #ifdef CONFIG_ESP32_S3_USB_OTG
-    bsp_usb_mode_select_host();
-    bsp_usb_host_power_mode(BSP_USB_HOST_POWER_MODE_USB_DEV, true);
+    // USB mode select host
+    const gpio_config_t io_config = {
+        .pin_bit_mask = BIT64(GPIO_NUM_18),
+        .mode = GPIO_MODE_OUTPUT,
+        .pull_up_en = GPIO_PULLUP_DISABLE,
+        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .intr_type = GPIO_INTR_DISABLE
+    };
+    ESP_ERROR_CHECK(gpio_config(&io_config));
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_18, 1));
+
+    // Set host usb dev power mode
+    const gpio_config_t power_io_config = {
+        .pin_bit_mask = BIT64(GPIO_NUM_17) | BIT64(GPIO_NUM_12) | BIT64(GPIO_NUM_13),
+        .mode = GPIO_MODE_OUTPUT,
+        .pull_up_en = GPIO_PULLUP_DISABLE,
+        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .intr_type = GPIO_INTR_DISABLE
+    };
+    ESP_ERROR_CHECK(gpio_config(&power_io_config));
+
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_17, 1)); // Configure the limiter 500mA
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_12, 0));
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_13, 0)); // Turn power off
+    vTaskDelay(pdMS_TO_TICKS(10));
+    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_12, 1)); // Turn on usb dev power mode
 #endif
     esp_event_loop_create_default();
     ESP_ERROR_CHECK(esp_event_handler_register(ESP_MSC_OTA_EVENT, ESP_EVENT_ANY_ID, &msc_ota_event_handler, NULL));