Skip to content

fix: perimgr + begin #9331

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 16 commits into from
Mar 5, 2024
Merged

fix: perimgr + begin #9331

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f565e02
fix: perimgr + begin
SuGlider Mar 4, 2024
eff01f5
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
d82143b
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
d333705
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
1462951
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
e17999c
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
a511d72
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
2708729
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
4969f13
Update cores/esp32/HWCDC.cpp
SuGlider Mar 4, 2024
9333624
Update HWCDC.cpp
SuGlider Mar 4, 2024
9a8ca7b
Update HWCDC.cpp
SuGlider Mar 4, 2024
631b7b7
Update cores/esp32/HWCDC.cpp
SuGlider Mar 5, 2024
05a35cd
Update cores/esp32/HWCDC.cpp
SuGlider Mar 5, 2024
5f6373c
Update cores/esp32/HWCDC.cpp
SuGlider Mar 5, 2024
bd79884
Update cores/esp32/HWCDC.cpp
SuGlider Mar 5, 2024
d174275
Merge branch 'master' into SuGlider-patch-1
SuGlider Mar 5, 2024
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
36 changes: 27 additions & 9 deletions cores/esp32/HWCDC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ static void ARDUINO_ISR_ATTR cdc0_write_char(char c) {
}

HWCDC::HWCDC() {

perimanSetBusDeinit(ESP32_BUS_TYPE_USB_DM, HWCDC::deinit);
perimanSetBusDeinit(ESP32_BUS_TYPE_USB_DP, HWCDC::deinit);
}

HWCDC::~HWCDC(){
Expand Down Expand Up @@ -238,26 +239,43 @@ void HWCDC::begin(unsigned long baud)
}
}
usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_BUS_RESET);
if(!intr_handle && esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, 0, hw_cdc_isr_handler, NULL, &intr_handle) != ESP_OK){
isr_log_e("HW USB CDC failed to init interrupts");
end();
return;
}
if (perimanSetBusDeinit(ESP32_BUS_TYPE_USB_DM, HWCDC::deinit) && perimanSetBusDeinit(ESP32_BUS_TYPE_USB_DP, HWCDC::deinit)) {
// Setting USB D+ D- pins
perimanSetPinBus(USB_DM_GPIO_NUM, ESP32_BUS_TYPE_USB_DM, (void *) this, -1, -1);
perimanSetPinBus(USB_DP_GPIO_NUM, ESP32_BUS_TYPE_USB_DP, (void *) this, -1, -1);
} else {
log_e("Serial JTAG Pins can't be set into Peripheral Manager.");
// Setting USB D+ D- pins
uint8_t pin = ESP32_BUS_TYPE_USB_DM;
if(perimanGetPinBusType(pin) != ESP32_BUS_TYPE_INIT){
if(!perimanClearPinBus(pin)){
goto err;
}
}
if(!perimanSetPinBus(pin, ESP32_BUS_TYPE_USB_DM, (void *) this, -1, -1)){
goto err;
}
pin = ESP32_BUS_TYPE_USB_DP;
if(perimanGetPinBusType(pin) != ESP32_BUS_TYPE_INIT){
if(!perimanClearPinBus(pin)){
goto err;
}
}
if(!perimanSetPinBus(pin, ESP32_BUS_TYPE_USB_DP, (void *) this, -1, -1)){
goto err;
}
return;

err:
log_e("Serial JTAG Pin %u can't be set into Peripheral Manager.", pin);
end();
}

void HWCDC::end()
{
//Disable tx/rx interrupt.
//Disable/clear/free tx/rx interrupt.
usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
esp_intr_free(intr_handle);
intr_handle = NULL;
if(tx_lock != NULL) {
Expand Down