Skip to content

Commit 852ecc3

Browse files
committed
feat(network): Update sta2eth example to esp_tinyusb v2.0.0
1 parent e55b7fe commit 852ecc3

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

examples/network/sta2eth/main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## IDF Component Manager Manifest File
22
dependencies:
33
espressif/esp_tinyusb:
4-
version: "^1.3.0"
4+
version: "^2.0.0"
55
rules:
66
- if: "idf_version >=4.4"
77
- if: "target in [esp32s2, esp32s3]"

examples/network/sta2eth/main/usb_ncm_iface.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Unlicense OR CC0-1.0
55
*/
@@ -12,6 +12,7 @@
1212
#include "esp_netif.h"
1313
#include "esp_event.h"
1414
#include "tinyusb.h"
15+
#include "tinyusb_default_config.h"
1516
#include "tinyusb_net.h"
1617
#include "wired_iface.h"
1718
#include "dhcpserver/dhcpserver_options.h"
@@ -44,9 +45,7 @@ void mac_spoof(mac_spoof_direction_t direction, uint8_t *buffer, uint16_t len, u
4445

4546
esp_err_t wired_bridge_init(wired_rx_cb_t rx_cb, wired_free_cb_t free_cb)
4647
{
47-
const tinyusb_config_t tusb_cfg = {
48-
.external_phy = false,
49-
};
48+
const tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
5049
ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
5150

5251
tinyusb_net_config_t net_config = {
@@ -56,7 +55,7 @@ esp_err_t wired_bridge_init(wired_rx_cb_t rx_cb, wired_free_cb_t free_cb)
5655

5756
esp_read_mac(net_config.mac_addr, ESP_MAC_WIFI_STA);
5857

59-
esp_err_t ret = tinyusb_net_init(TINYUSB_USBDEV_0, &net_config);
58+
esp_err_t ret = tinyusb_net_init(&net_config);
6059
if (ret != ESP_OK) {
6160
ESP_LOGE(TAG, "USB net init but not connect wifi");
6261
return ret;
@@ -113,9 +112,7 @@ static esp_err_t netif_recv_callback(void *buffer, uint16_t len, void *ctx)
113112
*/
114113
esp_err_t wired_netif_init(void)
115114
{
116-
const tinyusb_config_t tusb_cfg = {
117-
.external_phy = false,
118-
};
115+
const tinyusb_config_t tusb_cfg = TINYUSB_DEFAULT_CONFIG();
119116
ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
120117

121118
const tinyusb_net_config_t net_config = {
@@ -125,7 +122,7 @@ esp_err_t wired_netif_init(void)
125122
.on_recv_callback = netif_recv_callback,
126123
};
127124

128-
esp_err_t ret = tinyusb_net_init(TINYUSB_USBDEV_0, &net_config);
125+
esp_err_t ret = tinyusb_net_init(&net_config);
129126
if (ret != ESP_OK) {
130127
ESP_LOGE(TAG, "Cannot initialize USB Net device");
131128
return ret;
Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
# ESP32S3 has USB-OTG, let's prefer virtual Ethernet (USB-NCM device)
22
CONFIG_EXAMPLE_WIRED_INTERFACE_IS_USB=y
33
CONFIG_EXAMPLE_WIRED_INTERFACE_IS_ETHERNET=n
4-
5-
# TinyUSB needs to be initialized and run from one core
6-
# that's why we pin the task to CPU0 and init tusb in the task
7-
# on dual core devices (ESP32S3)
8-
CONFIG_TINYUSB_TASK_AFFINITY_CPU0=y
9-
CONFIG_TINYUSB_INIT_IN_DEFAULT_TASK=y
10-
114
CONFIG_TINYUSB_NET_MODE_NCM=y

0 commit comments

Comments
 (0)