Merge branch 'feat/4g_ppp_support_p4_wifi' into 'master'

feat(4g_ppp): esp32p4 support create AP with c6

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

Author: lijunru-hub

components/usb/iot_usbh_cdc/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.1.0 - 2025-05-13
+
+### Features:
+
+* Skip open usb hub device.
+
 ## v1.1.0 - 2025-04-21
 
 ### Features:

components/usb/iot_usbh_cdc/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.0"
+version: "1.1.1"
 targets:
   - esp32s2
   - esp32s3

components/usb/iot_usbh_cdc/iot_usbh_cdc.c

@@ -233,16 +233,22 @@ static void usb_event_cb(const usb_host_client_event_msg_t *event_msg, void *arg
         }
         assert(current_device);
 
+        const usb_device_desc_t *device_desc;
+        ESP_ERROR_CHECK(usb_host_get_device_descriptor(current_device, &device_desc));
+
+        if (device_desc->bDeviceClass == USB_CLASS_HUB) {
+            ESP_LOGI(TAG, "Detect hub device, skip");
+            usb_host_device_close(p_usbh_cdc_obj->cdc_client_hdl, current_device);
+            return;
+        }
+
         new_dev_cb_t *new_dev_cb;
         SLIST_FOREACH(new_dev_cb, &p_usbh_cdc_obj->new_dev_cb_list, list_entry) {
             if (new_dev_cb->cb) {
                 new_dev_cb->cb(current_device, new_dev_cb->user_data);
             }
         }
 
-        const usb_device_desc_t *device_desc;
-        ESP_ERROR_CHECK(usb_host_get_device_descriptor(current_device, &device_desc));
-
         usbh_cdc_t *cdc;
         bool if_opened = false;
         SLIST_FOREACH(cdc, &p_usbh_cdc_obj->cdc_devices_list, list_entry) {
@@ -707,6 +713,12 @@ static esp_err_t _cdc_find_and_open_usb_device(usbh_cdc_t *cdc)
         const usb_device_desc_t *device_desc;
         ESP_ERROR_CHECK(usb_host_get_device_descriptor(current_device, &device_desc));
 
+        if (device_desc->bDeviceClass == USB_CLASS_HUB) {
+            ESP_LOGD(TAG, "Detect hub device, skip");
+            usb_host_device_close(p_usbh_cdc_obj->cdc_client_hdl, current_device);
+            continue;
+        }
+
         if ((cdc->vid == device_desc->idVendor || cdc->vid == CDC_HOST_ANY_VID) &&
                 (cdc->pid == device_desc->idProduct || cdc->pid == CDC_HOST_ANY_PID)) {
             // Return path 2:

docs/en/usb/usb_host/usb_ppp.rst

@@ -33,6 +33,8 @@ The following table lists the supported 4G module models. They can be configured
 +=================+
 | ML302-DNLM/CNLM |
 +-----------------+
+| NT26            |
++-----------------+
 | EC600NCNLC-N06  |
 +-----------------+
 | AIR780E         |

docs/zh_CN/usb/usb_host/usb_ppp.rst

@@ -33,6 +33,8 @@ PPP 是一种网络中最为基础的协议。PPP 协议（Point-to-Point Protoc
 +=================+
 | ML302-DNLM/CNLM |
 +-----------------+
+| NT26            |
++-----------------+
 | EC600NCNLC-N06  |
 +-----------------+
 | AIR780E         |

examples/usb/host/usb_cdc_4g_module/README.md

@@ -4,7 +4,7 @@
 
 This example demonstrates the **ESP32-S2**, **ESP32-S3** series SoC as a USB host to dial-up 4G Cat.1 through PPP to access the Internet, with the help of ESP32-SX Wi-Fi softAP function, share the Internet with IoT devices or mobile devices. Realize low-cost "medium-high-speed" Internet access.It is also equipped with a router management interface, which allows you to configure the router online and view the information of connected devices.
 
-In addition, the **ESP32-P4** supports the 4G Cat.4 module (EC20) with faster speeds, but it currently only supports internet access for itself.
+In addition, the **ESP32-P4** supports the 4G Cat.4 module (EC20) with faster speeds. It can also enable hotspot sharing by connecting an external ESP32 chip with Wi-Fi capability.
 
 **Features Supported:**
 
@@ -236,7 +236,3 @@ Enable the `4G Modem Configuration -> Dump system task status` option in `menuco
 
 > **4G Cat.1 theoretical peak download rate is 10 Mbps, peak upload rate is 5 Mbps**
 > The actual communication rate is affected by the operator's network, test software, Wi-Fi interference, and the number of terminal connections, etc.
-
-## Known Issues
-
-* ESP32-P4 currently does not support enabling the softAP function via `esp_wifi_remote`.

examples/usb/host/usb_cdc_4g_module/README_cn.md

@@ -4,7 +4,7 @@
 
 该示例程序可实现 **ESP32-S2**，**ESP32-S3** 系列 SoC 作为 USB 主机驱动 4G Cat.1 模组 PPP 拨号上网，同时可开启 ESP32-SX Wi-Fi AP 功能，分享互联网给物联网设备或手持设备，实现低成本 “中高速” 互联网接入。同时配有路由器管理界面，可以在线进行路由器配置和查看已连接设备信息。
 
-此外对于 **ESP32-P4** 支持了 4G Cat.4 模组（EC20），速率更快，暂时仅支持自身上网功能。
+此外对于 **ESP32-P4** 支持了 4G Cat.4 模组（EC20），速率更快。并可通过外挂 ESP32 带 Wi-Fi 版本芯片实现热点共享。
 
 **已实现功能：**
 
@@ -231,14 +231,10 @@ I (13855) 4g_router_server: Starting webserver
 
 **测试结果：**
 
-| 测试项 |   峰值   |   平均   |
-| :----: | :------: | :------: |
-|  下载  |  6.4 Mbps  |  4 Mbps  |
-|  上传  | 5 Mbps | 2 Mbps |
+| 测试项 |   峰值   |  平均  |
+| :----: | :------: | :----: |
+|  下载  | 6.4 Mbps | 4 Mbps |
+|  上传  |  5 Mbps  | 2 Mbps |
 
 > **4G Cat.1 理论峰值下载速率 10 Mbps，峰值上传速率 5 Mbps**
 > 实际通信速率受运营商网络、测试软件、Wi-Fi 干扰情况、终端连接数影响，以实际使用为准
-
-## 已知问题
-
-* ESP32-P4 暂不支持通过 esp_wifi_remote 开启 softAP 功能。

examples/usb/host/usb_cdc_4g_module/main/Kconfig.projbuild

@@ -87,11 +87,14 @@ menu "4G Modem Example Config"
 
     config EXAMPLE_LED_RED_SYSTEM_GPIO
         int "System status led (red) gpio, set 0 if not use"
+        default 21 if IDF_TARGET_ESP32P4
         default 15
     config EXAMPLE_LED_BLUE_WIFI_GPIO
         int "Wi-Fi status led (blue) gpio, set 0 if not use"
+        default 22 if IDF_TARGET_ESP32P4
         default 17
     config EXAMPLE_LED_GREEN_4GMODEM_GPIO
         int "Modem status led (green) gpio, set 0 if not use"
+        default 26 if IDF_TARGET_ESP32P4
         default 16
 endmenu

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

@@ -248,11 +248,9 @@ void app_main(void)
     modem_http_init(&s_modem_wifi_config);
 #endif
 
-#if !CONFIG_IDF_TARGET_ESP32P4
     esp_netif_t *ap_netif = modem_wifi_ap_init();
     assert(ap_netif != NULL);
     ESP_ERROR_CHECK(modem_wifi_set(&s_modem_wifi_config));
-#endif
 
 #ifdef CONFIG_EXAMPLE_PING_NETWORK
     ip_addr_t target_addr;

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

@@ -8,6 +8,10 @@ dependencies:
   iot_usbh_modem:
     version: "^1.1.0"
     override_path: "../../../../../components/usb/iot_usbh_modem"
+  espressif/esp_wifi_remote:
+    version: "^0.9.0"
+    rules:
+      - if: "target in [esp32p4]"
   espressif/esp32_s3_usb_otg:
     version: "^1.5.1"
     rules: