From 388ff32eb09aa572d98c54cb355f1912ce42707c Mon Sep 17 00:00:00 2001 From: Roman Leonov Date: Thu, 15 Dec 2022 16:02:53 +0100 Subject: [PATCH] tinyUSB: ESP_OK return option has been added --- usb/esp_tinyusb/idf_component.yml | 4 ++-- usb/esp_tinyusb/tusb_cdc_acm.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/usb/esp_tinyusb/idf_component.yml b/usb/esp_tinyusb/idf_component.yml index ebd9e1b..f3175bd 100644 --- a/usb/esp_tinyusb/idf_component.yml +++ b/usb/esp_tinyusb/idf_component.yml @@ -1,11 +1,11 @@ description: Espressif's additions to TinyUSB documentation: "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-reference/peripherals/usb_device.html" -version: 1.0.0 +version: 1.0.1 url: https://github.com/espressif/idf-extra-components/tree/master/usb/esp_tinyusb dependencies: idf: '>=5.0' # IDF 4.x contains TinyUSB as submodule tinyusb: - version: '~0.12.2' # Use fixed minor version. TinyUSB does not guarantee backward compatibility + version: '^0.12.2' # Use fixed minor version. TinyUSB does not guarantee backward compatibility public: true targets: - esp32s2 diff --git a/usb/esp_tinyusb/tusb_cdc_acm.c b/usb/esp_tinyusb/tusb_cdc_acm.c index 725426e..d3f9e65 100644 --- a/usb/esp_tinyusb/tusb_cdc_acm.c +++ b/usb/esp_tinyusb/tusb_cdc_acm.c @@ -307,9 +307,10 @@ esp_err_t tinyusb_cdcacm_write_flush(tinyusb_cdcacm_itf_t itf, uint32_t timeout_ if (tud_cdc_n_write_occupied(itf)) { ESP_LOGW(TAG, "remained data to flush!"); return ESP_FAIL; + } else { + return ESP_OK; } } - return ESP_ERR_TIMEOUT; } else { // trying during the timeout uint32_t ticks_start = xTaskGetTickCount(); uint32_t ticks_now = ticks_start;