Skip to content

feat(tinyusb_cdc): avoid infinite loop when TinyUSB CDC layer hangs #11904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2025
+4 −1
Merged

feat(tinyusb_cdc): avoid infinite loop when TinyUSB CDC layer hangs #11904

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca901a8
feat(tinyusb_cdc): write timeout
SuGlider Oct 7, 2025
743b6e9
fix(usb_cdc): better timeout calculation
SuGlider Oct 7, 2025
8833edb
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cores/esp32/USBCDC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,11 @@ size_t USBCDC::write(const uint8_t *buffer, size_t size) {
return 0;
}
size_t to_send = size, so_far = 0;
// writeTimeout will prevent that TinyUSB failure locks the while(to_send) loop
uint32_t writeTimeout = millis() + tx_timeout_ms;
while (to_send) {
if (!tud_cdc_n_connected(itf)) {
if (!tud_cdc_n_connected(itf) || (int32_t)(millis() - writeTimeout) >= 0) {
log_e("USB is disconnected or CDC writing has timed out.");
size = so_far;
break;
}
Expand Down
Loading