Skip to content

Commit de0ba9c

Browse files
committed
Merge branch 'fix/esp_usb_cdc_acm_read_return_val' into 'master'
fix: Fix the ESP USB CDC ACM port read return value Closes ESF-157 and ESF-145 See merge request espressif/esp-serial-flasher!124
2 parents 0a44b73 + 81b966d commit de0ba9c

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

examples/esp32_usb_cdc_acm_example/main/main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ void app_main(void)
9696
device_disconnected_sem = xSemaphoreCreateBinary();
9797
assert(device_disconnected_sem);
9898

99-
// Delay as target may not be ready to accept commands immediately after connection
100-
loader_port_delay_ms(100);
101-
10299
/* The ESP32-S3 ignores the line coding set commands,
103100
so we don't set the higher baudrate argument */
104101
if (connect_to_target(0) == ESP_LOADER_SUCCESS) {

port/esp32_usb_cdc_acm_port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ esp_loader_error_t loader_port_read(uint8_t *data, const uint16_t size, const ui
156156
#endif
157157
return ESP_LOADER_SUCCESS;
158158
} else {
159-
return ESP_LOADER_ERROR_FAIL;
159+
return ESP_LOADER_ERROR_TIMEOUT;
160160
}
161161
}
162162

0 commit comments

Comments
 (0)