feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Handle persistent reboot better in CDC

Browse Source
This commit is contained in:
me-no-dev
2020-07-02 13:07:34 +03:00
parent 7f54a357a4
commit 29e3d0e75f
10 changed files with 228 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/USB/src/USB.cpp
View File

@ -42,8 +42,7 @@ static uint16_t load_dfu_descriptor(uint8_t * dst, uint8_t * itf)
// Invoked on DFU_DETACH request to reboot to the bootloader
void tud_dfu_rt_reboot_to_dfu(void)
{
tinyusb_persist_set_mode(REBOOT_BOOTLOADER_DFU);
esp_restart();
usb_persist_restart(RESTART_BOOTLOADER_DFU);
}
#endif /* CFG_TUD_DFU_RT */

21
libraries/USB/src/USBCDC.cpp
View File

@ -70,7 +70,7 @@ static void usb_unplugged_cb(void* arg, esp_event_base_t event_base, int32_t eve
((USBCDC*)arg)->_onUnplugged();
}
USBCDC::USBCDC(uint8_t itfn) : 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) {
USBCDC::USBCDC(uint8_t itfn) : itf(itfn), bit_rate(0), stop_bits(0), parity(0), data_bits(0), dtr(false), rts(false), connected(usb_persist_this_boot()), reboot_enable(true), rx_queue(NULL) {
tinyusb_enable_interface(USB_INTERFACE_CDC, TUD_CDC_DESC_LEN, load_cdc_descriptor);
if(itf < MAX_USB_CDC_DEVICES){
devices[itf] = this;
@ -94,6 +94,15 @@ void USBCDC::begin(size_t rx_queue_len)
if(!rx_queue){
return;
}
if(connected){
arduino_usb_cdc_event_data_t p = {0};
arduino_usb_event_post(ARDUINO_USB_CDC_EVENTS, ARDUINO_USB_CDC_CONNECTED_EVENT, &p, sizeof(arduino_usb_cdc_event_data_t), portMAX_DELAY);
arduino_usb_cdc_event_data_t l = {0};
l.line_state.dtr = true;
l.line_state.rts = true;
arduino_usb_event_post(ARDUINO_USB_CDC_EVENTS, ARDUINO_USB_CDC_LINE_STATE_EVENT, &l, sizeof(arduino_usb_cdc_event_data_t), portMAX_DELAY);
}
}
void USBCDC::end()
@ -137,8 +146,7 @@ void USBCDC::_onLineState(bool _dtr, bool _rts){
}
} else if(!dtr && !rts){
if(lineState == CDC_LINE_3){
tinyusb_persist_set_mode(REBOOT_BOOTLOADER);
esp_restart();
usb_persist_restart(RESTART_BOOTLOADER);
} else {
lineState = CDC_LINE_IDLE;
}
@ -195,13 +203,6 @@ void USBCDC::_onRX(){
}
void USBCDC::enableReboot(bool enable){
if(enable != reboot_enable){
if(enable){
tinyusb_persist_set_mode(REBOOT_PERSIST);
} else {
tinyusb_persist_set_mode(REBOOT_NO_PERSIST);
}
}
reboot_enable = enable;
}
bool USBCDC::rebootEnabled(void){