Skip to content

GitLab

A
arduino-esp32
Unverified Commit 0f51c889 authored by Me No Dev's avatar Me No Dev Committed by GitHub
Browse files
Options

Merge branch 'master' into release/v2.x

parents ac814eed 18164e6f
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
cores/esp32/HWCDC.cpp
View file @ 0f51c889
...@@ -218,10 +218,10 @@ void HWCDC::setTxTimeoutMs(uint32_t timeout){ ...@@ -218,10 +218,10 @@ void HWCDC::setTxTimeoutMs(uint32_t timeout){
size_t HWCDC::setTxBufferSize(size_t tx_queue_len){ size_t HWCDC::setTxBufferSize(size_t tx_queue_len){
if(tx_ring_buf){ if(tx_ring_buf){
if(!tx_queue_len){
vRingbufferDelete(tx_ring_buf); vRingbufferDelete(tx_ring_buf);
tx_ring_buf = NULL; tx_ring_buf = NULL;
} }
if(!tx_queue_len){
return 0; return 0;
} }
tx_ring_buf = xRingbufferCreate(tx_queue_len, RINGBUF_TYPE_BYTEBUF); tx_ring_buf = xRingbufferCreate(tx_queue_len, RINGBUF_TYPE_BYTEBUF);
...@@ -319,19 +319,16 @@ void HWCDC::flush(void) ...@@ -319,19 +319,16 @@ void HWCDC::flush(void)
size_t HWCDC::setRxBufferSize(size_t rx_queue_len){ size_t HWCDC::setRxBufferSize(size_t rx_queue_len){
if(rx_queue){ if(rx_queue){
if(!rx_queue_len){
vQueueDelete(rx_queue); vQueueDelete(rx_queue);
rx_queue = NULL; rx_queue = NULL;
} }
if(!rx_queue_len){
return 0; return 0;
} }
rx_queue = xQueueCreate(rx_queue_len, sizeof(uint8_t)); rx_queue = xQueueCreate(rx_queue_len, sizeof(uint8_t));
if(!rx_queue){ if(!rx_queue){
return 0; return 0;
} }
if(!tx_ring_buf){
tx_ring_buf = xRingbufferCreate(rx_queue_len, RINGBUF_TYPE_BYTEBUF);
}
return rx_queue_len; return rx_queue_len;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment