Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f3b27f3

Browse files
me-no-devme-no-dev
authoredSep 15, 2021
Merge branch 'master' into idf-master
2 parents d771914 + 078671d commit f3b27f3

File tree

8 files changed

+262
-82
lines changed

8 files changed

+262
-82
lines changed
 

‎.github/workflows/test_selfhosted_runner.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Test Github action on self hosted RPI runnes
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
name: Dummy test - self hosted GHR
12+
runs-on: self-hosted
13+
steps:
14+
- name: Check out repo
15+
uses: actions/checkout@v2
16+
- name: Test message 1
17+
run: echo "This is test message"
18+
- name: Test message 2
19+
run: echo "This is test message2"
20+
- name: List directory
21+
run: ls
22+
- name: Create copy of README
23+
run: cp README.md README2.md
24+
- name: Read README2
25+
run: cat README2.md
26+
- name: Delete README2
27+
run: rm README2.md

‎boards.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ esp32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
5757
esp32c3.menu.CDCOnBoot.cdc=Enabled
5858
esp32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
5959

60-
esp32c3.menu.UploadMode.default=UART0
61-
esp32c3.menu.UploadMode.default.upload.use_1200bps_touch=false
62-
esp32c3.menu.UploadMode.default.upload.wait_for_upload_port=false
63-
esp32c3.menu.UploadMode.cdc=Internal USB
64-
esp32c3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
65-
esp32c3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
66-
6760
esp32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
6861
esp32c3.menu.PartitionScheme.default.build.partitions=default
6962
esp32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)

‎cores/esp32/HWCDC.cpp

Lines changed: 116 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,47 @@
2424
#include "soc/periph_defs.h"
2525
#include "hal/usb_serial_jtag_ll.h"
2626

27+
ESP_EVENT_DEFINE_BASE(ARDUINO_HW_CDC_EVENTS);
28+
2729
static RingbufHandle_t tx_ring_buf = NULL;
2830
static xQueueHandle rx_queue = NULL;
2931
static uint8_t rx_data_buf[64];
3032
static intr_handle_t intr_handle = NULL;
3133
static volatile bool initial_empty = false;
34+
static xSemaphoreHandle tx_lock = NULL;
35+
static uint32_t tx_timeout_ms = 200;
36+
static esp_event_loop_handle_t arduino_hw_cdc_event_loop_handle = NULL;
37+
38+
static esp_err_t arduino_hw_cdc_event_post(esp_event_base_t event_base, int32_t event_id, void *event_data, size_t event_data_size, BaseType_t *task_unblocked){
39+
if(arduino_hw_cdc_event_loop_handle == NULL){
40+
return ESP_FAIL;
41+
}
42+
return esp_event_isr_post_to(arduino_hw_cdc_event_loop_handle, event_base, event_id, event_data, event_data_size, task_unblocked);
43+
}
44+
45+
static esp_err_t arduino_hw_cdc_event_handler_register_with(esp_event_base_t event_base, int32_t event_id, esp_event_handler_t event_handler, void *event_handler_arg){
46+
if (!arduino_hw_cdc_event_loop_handle) {
47+
esp_event_loop_args_t event_task_args = {
48+
.queue_size = 5,
49+
.task_name = "arduino_hw_cdc_events",
50+
.task_priority = 5,
51+
.task_stack_size = 2048,
52+
.task_core_id = tskNO_AFFINITY
53+
};
54+
if (esp_event_loop_create(&event_task_args, &arduino_hw_cdc_event_loop_handle) != ESP_OK) {
55+
log_e("esp_event_loop_create failed");
56+
}
57+
}
58+
if(arduino_hw_cdc_event_loop_handle == NULL){
59+
return ESP_FAIL;
60+
}
61+
return esp_event_handler_register_with(arduino_hw_cdc_event_loop_handle, event_base, event_id, event_handler, event_handler_arg);
62+
}
3263

3364
static void hw_cdc_isr_handler(void *arg) {
3465
portBASE_TYPE xTaskWoken = 0;
3566
uint32_t usbjtag_intr_status = 0;
67+
arduino_hw_cdc_event_data_t event = {0};
3668
usbjtag_intr_status = usb_serial_jtag_ll_get_intsts_mask();
3769

3870
if (usbjtag_intr_status & USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY) {
@@ -45,6 +77,7 @@ static void hw_cdc_isr_handler(void *arg) {
4577
initial_empty = true;
4678
//send event?
4779
//ets_printf("CONNECTED\n");
80+
arduino_hw_cdc_event_post(ARDUINO_HW_CDC_EVENTS, ARDUINO_HW_CDC_CONNECTED_EVENT, &event, sizeof(arduino_hw_cdc_event_data_t), &xTaskWoken);
4881
}
4982
size_t queued_size;
5083
uint8_t *queued_buff = (uint8_t *)xRingbufferReceiveUpToFromISR(tx_ring_buf, &queued_size, 64);
@@ -58,6 +91,8 @@ static void hw_cdc_isr_handler(void *arg) {
5891
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
5992
//send event?
6093
//ets_printf("TX:%u\n", queued_size);
94+
event.tx.len = queued_size;
95+
arduino_hw_cdc_event_post(ARDUINO_HW_CDC_EVENTS, ARDUINO_HW_CDC_TX_EVENT, &event, sizeof(arduino_hw_cdc_event_data_t), &xTaskWoken);
6196
}
6297
} else {
6398
usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
@@ -77,13 +112,16 @@ static void hw_cdc_isr_handler(void *arg) {
77112
}
78113
//send event?
79114
//ets_printf("RX:%u/%u\n", i, rx_fifo_len);
115+
event.rx.len = i;
116+
arduino_hw_cdc_event_post(ARDUINO_HW_CDC_EVENTS, ARDUINO_HW_CDC_RX_EVENT, &event, sizeof(arduino_hw_cdc_event_data_t), &xTaskWoken);
80117
}
81118

82119
if (usbjtag_intr_status & USB_SERIAL_JTAG_INTR_BUS_RESET) {
83120
usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_BUS_RESET);
84121
initial_empty = false;
85122
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
86123
//ets_printf("BUS_RESET\n");
124+
arduino_hw_cdc_event_post(ARDUINO_HW_CDC_EVENTS, ARDUINO_HW_CDC_BUS_RESET_EVENT, &event, sizeof(arduino_hw_cdc_event_data_t), &xTaskWoken);
87125
}
88126

89127
if (xTaskWoken == pdTRUE) {
@@ -95,13 +133,13 @@ static void ARDUINO_ISR_ATTR cdc0_write_char(char c) {
95133
if(xPortInIsrContext()){
96134
xRingbufferSendFromISR(tx_ring_buf, (void*) (&c), 1, NULL);
97135
} else {
98-
xRingbufferSend(tx_ring_buf, (void*) (&c), 1, 0);
136+
xRingbufferSend(tx_ring_buf, (void*) (&c), 1, tx_timeout_ms / portTICK_PERIOD_MS);
99137
}
100138
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
101139
}
102140

103141
HWCDC::HWCDC() {
104-
142+
105143
}
106144

107145
HWCDC::~HWCDC(){
@@ -113,8 +151,19 @@ HWCDC::operator bool() const
113151
return initial_empty;
114152
}
115153

154+
void HWCDC::onEvent(esp_event_handler_t callback){
155+
onEvent(ARDUINO_HW_CDC_ANY_EVENT, callback);
156+
}
157+
158+
void HWCDC::onEvent(arduino_hw_cdc_event_t event, esp_event_handler_t callback){
159+
arduino_hw_cdc_event_handler_register_with(ARDUINO_HW_CDC_EVENTS, event, callback, this);
160+
}
161+
116162
void HWCDC::begin(unsigned long baud)
117163
{
164+
if(tx_lock == NULL) {
165+
tx_lock = xSemaphoreCreateMutex();
166+
}
118167
setRxBufferSize(256);//default if not preset
119168
setTxBufferSize(256);//default if not preset
120169

@@ -123,6 +172,7 @@ void HWCDC::begin(unsigned long baud)
123172
if(!intr_handle && esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, 0, hw_cdc_isr_handler, NULL, &intr_handle) != ESP_OK){
124173
isr_log_e("HW USB CDC failed to init interrupts");
125174
end();
175+
return;
126176
}
127177
}
128178

@@ -132,8 +182,19 @@ void HWCDC::end()
132182
usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_BUS_RESET);
133183
esp_intr_free(intr_handle);
134184
intr_handle = NULL;
185+
if(tx_lock != NULL) {
186+
vSemaphoreDelete(tx_lock);
187+
}
135188
setRxBufferSize(0);
136189
setTxBufferSize(0);
190+
if (arduino_hw_cdc_event_loop_handle) {
191+
esp_event_loop_delete(arduino_hw_cdc_event_loop_handle);
192+
arduino_hw_cdc_event_loop_handle = NULL;
193+
}
194+
}
195+
196+
void HWCDC::setTxTimeoutMs(uint32_t timeout){
197+
tx_timeout_ms = timeout;
137198
}
138199

139200
/*
@@ -157,21 +218,57 @@ size_t HWCDC::setTxBufferSize(size_t tx_queue_len){
157218

158219
int HWCDC::availableForWrite(void)
159220
{
160-
if(tx_ring_buf == NULL){
161-
return -1;
221+
if(tx_ring_buf == NULL || tx_lock == NULL){
222+
return 0;
223+
}
224+
if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
225+
return 0;
162226
}
163-
return xRingbufferGetCurFreeSize(tx_ring_buf);
227+
size_t a = xRingbufferGetCurFreeSize(tx_ring_buf);
228+
xSemaphoreGive(tx_lock);
229+
return a;
164230
}
165231

166232
size_t HWCDC::write(const uint8_t *buffer, size_t size)
167233
{
168-
// Blocking method, Sending data to ringbuffer, and handle the data in ISR.
169-
if(xRingbufferSend(tx_ring_buf, (void*) (buffer), size, 200 / portTICK_PERIOD_MS) != pdTRUE){
170-
log_e("Write Failed");
234+
if(buffer == NULL || size == 0 || tx_ring_buf == NULL || tx_lock == NULL){
171235
return 0;
172236
}
173-
// Now trigger the ISR to read data from the ring buffer.
174-
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
237+
if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
238+
return 0;
239+
}
240+
size_t max_size = xRingbufferGetMaxItemSize(tx_ring_buf);
241+
size_t space = xRingbufferGetCurFreeSize(tx_ring_buf);
242+
size_t to_send = size, so_far = 0;
243+
244+
if(space > size){
245+
space = size;
246+
}
247+
// Non-Blocking method, Sending data to ringbuffer, and handle the data in ISR.
248+
if(xRingbufferSend(tx_ring_buf, (void*) (buffer), space, 0) != pdTRUE){
249+
size = 0;
250+
} else {
251+
to_send -= space;
252+
so_far += space;
253+
// Now trigger the ISR to read data from the ring buffer.
254+
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
255+
256+
while(to_send){
257+
if(max_size > to_send){
258+
max_size = to_send;
259+
}
260+
// Blocking method, Sending data to ringbuffer, and handle the data in ISR.
261+
if(xRingbufferSend(tx_ring_buf, (void*) (buffer+so_far), max_size, tx_timeout_ms / portTICK_PERIOD_MS) != pdTRUE){
262+
size = so_far;
263+
break;
264+
}
265+
so_far += max_size;
266+
to_send -= max_size;
267+
// Now trigger the ISR to read data from the ring buffer.
268+
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
269+
}
270+
}
271+
xSemaphoreGive(tx_lock);
175272
return size;
176273
}
177274

@@ -182,15 +279,23 @@ size_t HWCDC::write(uint8_t c)
182279

183280
void HWCDC::flush(void)
184281
{
185-
if(tx_ring_buf == NULL){
282+
if(tx_ring_buf == NULL || tx_lock == NULL){
283+
return;
284+
}
285+
if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
186286
return;
187287
}
188288
UBaseType_t uxItemsWaiting = 0;
189289
vRingbufferGetInfo(tx_ring_buf, NULL, NULL, NULL, NULL, &uxItemsWaiting);
290+
if(uxItemsWaiting){
291+
// Now trigger the ISR to read data from the ring buffer.
292+
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
293+
}
190294
while(uxItemsWaiting){
191295
delay(5);
192296
vRingbufferGetInfo(tx_ring_buf, NULL, NULL, NULL, NULL, &uxItemsWaiting);
193297
}
298+
xSemaphoreGive(tx_lock);
194299
}
195300

196301
/*

‎cores/esp32/HWCDC.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,41 @@
1717
#if CONFIG_IDF_TARGET_ESP32C3
1818

1919
#include <inttypes.h>
20+
#include "esp_event.h"
2021
#include "Stream.h"
2122

23+
ESP_EVENT_DECLARE_BASE(ARDUINO_HW_CDC_EVENTS);
24+
25+
typedef enum {
26+
ARDUINO_HW_CDC_ANY_EVENT = ESP_EVENT_ANY_ID,
27+
ARDUINO_HW_CDC_CONNECTED_EVENT = 0,
28+
ARDUINO_HW_CDC_BUS_RESET_EVENT,
29+
ARDUINO_HW_CDC_RX_EVENT,
30+
ARDUINO_HW_CDC_TX_EVENT,
31+
ARDUINO_HW_CDC_MAX_EVENT,
32+
} arduino_hw_cdc_event_t;
33+
34+
typedef union {
35+
struct {
36+
size_t len;
37+
} rx;
38+
struct {
39+
size_t len;
40+
} tx;
41+
} arduino_hw_cdc_event_data_t;
42+
2243
class HWCDC: public Stream
2344
{
2445
public:
2546
HWCDC();
2647
~HWCDC();
2748

49+
void onEvent(esp_event_handler_t callback);
50+
void onEvent(arduino_hw_cdc_event_t event, esp_event_handler_t callback);
51+
2852
size_t setRxBufferSize(size_t);
2953
size_t setTxBufferSize(size_t);
54+
void setTxTimeoutMs(uint32_t timeout);
3055
void begin(unsigned long baud=0);
3156
void end();
3257

‎cores/esp32/USBCDC.cpp

Lines changed: 82 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -62,63 +62,40 @@ void tud_cdc_rx_cb(uint8_t itf)
6262

6363
// Invoked when received send break
6464
void tud_cdc_send_break_cb(uint8_t itf, uint16_t duration_ms){
65-
//isr_log_v("itf: %u, duration_ms: %u", itf, duration_ms);
65+
//log_v("itf: %u, duration_ms: %u", itf, duration_ms);
6666
}
6767

6868
// Invoked when space becomes available in TX buffer
6969
void tud_cdc_tx_complete_cb(uint8_t itf){
70-
if(itf < MAX_USB_CDC_DEVICES && devices[itf] != NULL && devices[itf]->tx_sem != NULL){
71-
xSemaphoreGive(devices[itf]->tx_sem);
70+
if(itf < MAX_USB_CDC_DEVICES && devices[itf] != NULL){
7271
devices[itf]->_onTX();
7372
}
7473
}
7574

76-
static size_t tinyusb_cdc_write(uint8_t itf, const uint8_t *buffer, size_t size){
77-
if(itf >= MAX_USB_CDC_DEVICES || devices[itf] == NULL || devices[itf]->tx_sem == NULL){
78-
return 0;
75+
static void ARDUINO_ISR_ATTR cdc0_write_char(char c){
76+
if(devices[0] != NULL){
77+
devices[0]->write(c);
7978
}
80-
if(!tud_cdc_n_connected(itf)){
81-
return 0;
82-
}
83-
size_t tosend = size, sofar = 0;
84-
while(tosend){
85-
uint32_t space = tud_cdc_n_write_available(itf);
86-
if(!space){
87-
//make sure that we do not get previous semaphore
88-
xSemaphoreTake(devices[itf]->tx_sem, 0);
89-
//wait for tx_complete
90-
if(xSemaphoreTake(devices[itf]->tx_sem, 200 / portTICK_PERIOD_MS) == pdTRUE){
91-
space = tud_cdc_n_write_available(itf);
92-
}
93-
if(!space){
94-
return sofar;
95-
}
96-
}
97-
if(tosend < space){
98-
space = tosend;
99-
}
100-
uint32_t sent = tud_cdc_n_write(itf, buffer + sofar, space);
101-
if(!sent){
102-
return sofar;
103-
}
104-
sofar += sent;
105-
tosend -= sent;
106-
tud_cdc_n_write_flush(itf);
107-
//xSemaphoreTake(devices[itf]->tx_sem, portMAX_DELAY);
108-
}
109-
return sofar;
110-
}
111-
112-
static void ARDUINO_ISR_ATTR cdc0_write_char(char c)
113-
{
114-
tinyusb_cdc_write(0, (const uint8_t *)&c, 1);
11579
}
11680

11781
static void usb_unplugged_cb(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data){
11882
((USBCDC*)arg)->_onUnplugged();
11983
}
12084

121-
USBCDC::USBCDC(uint8_t itfn) : tx_sem(NULL), itf(itfn), bit_rate(0), stop_bits(0), parity(0), data_bits(0), dtr(false), rts(false), connected(false), reboot_enable(true), rx_queue(NULL) {
85+
USBCDC::USBCDC(uint8_t itfn)
86+
: itf(itfn)
87+
, bit_rate(0)
88+
, stop_bits(0)
89+
, parity(0)
90+
, data_bits(0)
91+
, dtr(false)
92+
, rts(false)
93+
, connected(false)
94+
, reboot_enable(true)
95+
, rx_queue(NULL)
96+
, tx_lock(NULL)
97+
, tx_timeout_ms(250)
98+
{
12299
tinyusb_enable_interface(USB_INTERFACE_CDC, TUD_CDC_DESC_LEN, load_cdc_descriptor);
123100
if(itf < MAX_USB_CDC_DEVICES){
124101
arduino_usb_event_handler_register_with(ARDUINO_USB_EVENTS, ARDUINO_USB_STOPPED_EVENT, usb_unplugged_cb, this);
@@ -153,9 +130,8 @@ size_t USBCDC::setRxBufferSize(size_t rx_queue_len){
153130

154131
void USBCDC::begin(unsigned long baud)
155132
{
156-
if(tx_sem == NULL){
157-
tx_sem = xSemaphoreCreateBinary();
158-
xSemaphoreTake(tx_sem, 0);
133+
if(tx_lock == NULL) {
134+
tx_lock = xSemaphoreCreateMutex();
159135
}
160136
setRxBufferSize(256);//default if not preset
161137
devices[itf] = this;
@@ -166,12 +142,15 @@ void USBCDC::end()
166142
connected = false;
167143
devices[itf] = NULL;
168144
setRxBufferSize(0);
169-
if (tx_sem != NULL) {
170-
vSemaphoreDelete(tx_sem);
171-
tx_sem = NULL;
145+
if(tx_lock != NULL) {
146+
vSemaphoreDelete(tx_lock);
172147
}
173148
}
174149

150+
void USBCDC::setTxTimeoutMs(uint32_t timeout){
151+
tx_timeout_ms = timeout;
152+
}
153+
175154
void USBCDC::_onUnplugged(void){
176155
if(connected){
177156
connected = false;
@@ -336,23 +315,73 @@ size_t USBCDC::read(uint8_t *buffer, size_t size)
336315

337316
void USBCDC::flush(void)
338317
{
339-
if(itf >= MAX_USB_CDC_DEVICES || tx_sem == NULL){
318+
if(itf >= MAX_USB_CDC_DEVICES || tx_lock == NULL || !tud_cdc_n_connected(itf)){
319+
return;
320+
}
321+
if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
340322
return;
341323
}
342324
tud_cdc_n_write_flush(itf);
325+
xSemaphoreGive(tx_lock);
343326
}
344327

345328
int USBCDC::availableForWrite(void)
346329
{
347-
if(itf >= MAX_USB_CDC_DEVICES || tx_sem == NULL){
348-
return -1;
330+
if(itf >= MAX_USB_CDC_DEVICES || tx_lock == NULL || !tud_cdc_n_connected(itf)){
331+
return 0;
349332
}
350-
return tud_cdc_n_write_available(itf);
333+
if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
334+
return 0;
335+
}
336+
size_t a = tud_cdc_n_write_available(itf);
337+
xSemaphoreGive(tx_lock);
338+
return a;
351339
}
352340

353341
size_t USBCDC::write(const uint8_t *buffer, size_t size)
354342
{
355-
return tinyusb_cdc_write(itf, buffer, size);
343+
if(itf >= MAX_USB_CDC_DEVICES || tx_lock == NULL || buffer == NULL || size == 0 || !tud_cdc_n_connected(itf)){
344+
return 0;
345+
}
346+
if(xPortInIsrContext()){
347+
BaseType_t taskWoken = false;
348+
if(xSemaphoreTakeFromISR(tx_lock, &taskWoken) != pdPASS){
349+
return 0;
350+
}
351+
} else if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
352+
return 0;
353+
}
354+
size_t to_send = size, so_far = 0;
355+
while(to_send){
356+
if(!tud_cdc_n_connected(itf)){
357+
size = so_far;
358+
break;
359+
}
360+
size_t space = tud_cdc_n_write_available(itf);
361+
if(!space){
362+
tud_cdc_n_write_flush(itf);
363+
continue;
364+
}
365+
if(space > to_send){
366+
space = to_send;
367+
}
368+
size_t sent = tud_cdc_n_write(itf, buffer+so_far, space);
369+
if(sent){
370+
so_far += sent;
371+
to_send -= sent;
372+
tud_cdc_n_write_flush(itf);
373+
} else {
374+
size = so_far;
375+
break;
376+
}
377+
}
378+
if(xPortInIsrContext()){
379+
BaseType_t taskWoken = false;
380+
xSemaphoreGiveFromISR(tx_lock, &taskWoken);
381+
} else {
382+
xSemaphoreGive(tx_lock);
383+
}
384+
return size;
356385
}
357386

358387
size_t USBCDC::write(uint8_t c)

‎cores/esp32/USBCDC.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
#include <inttypes.h>
2020
#include "esp_event.h"
21+
#include "freertos/FreeRTOS.h"
22+
#include "freertos/queue.h"
23+
#include "freertos/semphr.h"
2124
#include "Stream.h"
2225

2326
ESP_EVENT_DECLARE_BASE(ARDUINO_USB_CDC_EVENTS);
@@ -58,7 +61,8 @@ class USBCDC: public Stream
5861
void onEvent(esp_event_handler_t callback);
5962
void onEvent(arduino_usb_cdc_event_t event, esp_event_handler_t callback);
6063

61-
size_t setRxBufferSize(size_t);
64+
size_t setRxBufferSize(size_t size);
65+
void setTxTimeoutMs(uint32_t timeout);
6266
void begin(unsigned long baud=0);
6367
void end();
6468

@@ -113,7 +117,6 @@ class USBCDC: public Stream
113117
void _onRX(void);
114118
void _onTX(void);
115119
void _onUnplugged(void);
116-
xSemaphoreHandle tx_sem;
117120

118121
protected:
119122
uint8_t itf;
@@ -126,6 +129,8 @@ class USBCDC: public Stream
126129
bool connected;
127130
bool reboot_enable;
128131
xQueueHandle rx_queue;
132+
xSemaphoreHandle tx_lock;
133+
uint32_t tx_timeout_ms;
129134

130135
};
131136

‎cores/esp32/esp32-hal-uart.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,13 +368,9 @@ void uartSetDebug(uart_t* uart)
368368
{
369369
if(uart == NULL || uart->num >= SOC_UART_NUM) {
370370
s_uart_debug_nr = -1;
371-
//ets_install_putc1(NULL);
372-
//return;
373-
} else
374-
if(s_uart_debug_nr == uart->num) {
375-
return;
376-
} else
377-
s_uart_debug_nr = uart->num;
371+
} else {
372+
s_uart_debug_nr = uart->num;
373+
}
378374
uart_install_putc();
379375
}
380376

‎docs/source/getting_started.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Here are the ESP32 series supported by the Arduino-ESP32 project:
3535
SoC Stable Development Datasheet
3636
======== ====== =========== ===================================
3737
ESP32 Yes Yes `ESP32 Datasheet`_
38-
ESP32-S2 No Yes `ESP32-S2 Datasheet`_
39-
ESP32-C3 No Yes `ESP32-C3 Datasheet`_
38+
ESP32-S2 Yes Yes `ESP32-S2 Datasheet`_
39+
ESP32-C3 Yes Yes `ESP32-C3 Datasheet`_
4040
ESP32-S3 No No Not Available Yet
4141
======== ====== =========== ===================================
4242

0 commit comments

Comments
 (0)
Please sign in to comment.