Skip to content

Fix: random freezing (WIP) #17

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

Open
bertmelis wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: random freezing (WIP) #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions src/USBHostSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ std::size_t USBHostSerial::available() {
uint8_t USBHostSerial::read() {
std::size_t pxItemSize = 0;
uint8_t retVal = 0;
void* ret = xRingbufferReceiveUpTo(_rx_buf_handle, &pxItemSize, pdMS_TO_TICKS(1), 1);
void* ret = xRingbufferReceiveUpTo(_rx_buf_handle, &pxItemSize, pdMS_TO_TICKS(10), 1);
if (pxItemSize > 0) {
retVal = *reinterpret_cast<uint8_t*>(ret);
vRingbufferReturnItem(_rx_buf_handle, ret);
Expand All @@ -124,7 +124,7 @@ std::size_t USBHostSerial::read(uint8_t *dest, std::size_t size) {
std::size_t retVal = 0;
std::size_t pxItemSize = 0;
while (size > pxItemSize) {
void *ret = xRingbufferReceiveUpTo(_rx_buf_handle, &pxItemSize, pdMS_TO_TICKS(1), size - pxItemSize);
void *ret = xRingbufferReceiveUpTo(_rx_buf_handle, &pxItemSize, pdMS_TO_TICKS(10), size - pxItemSize);
if (ret) {
std::memcpy(dest, ret, pxItemSize);
retVal += pxItemSize;
Expand All @@ -143,7 +143,7 @@ void USBHostSerial::flush(bool txOnly) {
taskYIELD();
} while (numItemsWaiting > 0);

// if not only tx has to be flushed, read rx buffer untill empty
// if not only tx has to be flushed, read rx buffer until empty
if (!txOnly) {
do {
vRingbufferGetInfo(_rx_buf_handle, nullptr, nullptr, nullptr, nullptr, &numItemsWaiting);
Expand Down Expand Up @@ -185,15 +185,17 @@ void USBHostSerial::_setup() {
}

bool USBHostSerial::_handle_rx(const uint8_t *data, size_t data_len, void *arg) {
std::size_t lenReceived = 0;
while (lenReceived < data_len && xRingbufferSend(static_cast<USBHostSerial*>(arg)->_rx_buf_handle, &data[lenReceived], 1, pdMS_TO_TICKS(10)) == pdTRUE) {
++lenReceived;
USBHostSerial* instance = static_cast<USBHostSerial*>(arg);
if (xRingbufferSend(instance->_rx_buf_handle, data, data_len, 0) == pdTRUE) {
return true;
}
if (lenReceived < data_len) {
// log overflow warning
static_cast<USBHostSerial*>(arg)->_log("USB rx buf overflow");
// log overflow warning if free buffer space is the issue
if (xRingbufferGetCurFreeSize(instance->_rx_buf_handle) < data_len) {
instance->_log("USB rx buf overflow");
return true;
}
return true;
// no spurious logging here, might be an expected timeout
return false;
}

void USBHostSerial::_handle_event(const cdc_acm_host_dev_event_data_t *event, void *user_ctx) {
Expand Down