github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-19 11:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tinyusb][usb_cdc_acm] Bump esp_tinyusb to 2.1.1 (#14796)

Browse Source 
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jonathan Swoboda
2026-03-14 15:01:29 -04:00
committed by GitHub
co-authored by Claude Opus 4.6
parent f12531e7e0
commit c52042e023
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/tinyusb/__init__.py
+1 -1
View File
@@ -54,7 +54,7 @@ async def to_code(config):
if config[CONF_USB_SERIAL_STR]:
cg.add(var.set_usb_desc_serial(config[CONF_USB_SERIAL_STR]))
add_idf_component(name="espressif/esp_tinyusb", ref="1.7.6~1")
add_idf_component(name="espressif/esp_tinyusb", ref="2.1.1")
add_idf_sdkconfig_option("CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID", False)
add_idf_sdkconfig_option("CONFIG_TINYUSB_DESC_USE_DEFAULT_PID", False)
esphome/components/tinyusb/tinyusb_component.cpp
+8 -4
View File
@@ -16,10 +16,14 @@ void TinyUSB::setup() {
}
this->tusb_cfg_ = {
.descriptor = &this->usb_descriptor_,
.string_descriptor = this->string_descriptor_,
.string_descriptor_count = SIZE,
.external_phy = false,
.port = TINYUSB_PORT_FULL_SPEED_0,
.phy = {.skip_setup = false},
.descriptor =
{
.device = &this->usb_descriptor_,
.string = this->string_descriptor_,
.string_count = SIZE,
},
};
esp_err_t result = tinyusb_driver_install(&this->tusb_cfg_);
esphome/components/usb_cdc_acm/usb_cdc_acm.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include <functional>
#include "freertos/ringbuf.h"
#include "tusb_cdc_acm.h"
#include "tinyusb_cdc_acm.h"
namespace esphome::usb_cdc_acm {
esphome/components/usb_cdc_acm/usb_cdc_acm_esp32.cpp
+3 -4
View File
@@ -11,7 +11,7 @@
#include "esp_log.h"
#include "tusb.h"
#include "tusb_cdc_acm.h"
#include "tinyusb_cdc_acm.h"
namespace esphome::usb_cdc_acm {
@@ -140,7 +140,6 @@ void USBCDCACMInstance::setup() {
// Configure this CDC interface
const tinyusb_config_cdcacm_t acm_cfg = {
.usb_dev = TINYUSB_USBDEV_0,
.cdc_port = static_cast<tinyusb_cdcacm_itf_t>(this->itf_),
.callback_rx = &tinyusb_cdc_rx_callback,
.callback_rx_wanted_char = NULL,
@@ -148,9 +147,9 @@ void USBCDCACMInstance::setup() {
.callback_line_coding_changed = &tinyusb_cdc_line_coding_changed_callback,
};
esp_err_t result = tusb_cdc_acm_init(&acm_cfg);
esp_err_t result = tinyusb_cdcacm_init(&acm_cfg);
if (result != ESP_OK) {
ESP_LOGE(TAG, "tusb_cdc_acm_init failed: %d", result);
ESP_LOGE(TAG, "tinyusb_cdcacm_init failed: %d", result);
this->parent_->mark_failed();
return;
}
esphome/idf_component.yml
+1 -1
View File
@@ -30,7 +30,7 @@ dependencies:
rules:
- if: "target in [esp32, esp32p4]"
espressif/esp_tinyusb:
version: "1.7.6~1"
version: "2.1.1"
rules:
- if: "target in [esp32s2, esp32s3, esp32p4]"
esphome/esp-hub75: