5e692d0460
This fixes issue of ESP32-S3 switching its config over to USB serial/JTAG instead of native USB. The the existing logic was hard to follow, adding this config macro makes it easier to see which USB is in use and to have board definitions that enable/disable different USB levels. This commit also drops (nominal) support for manually setting CONFIG_ESP_CONSOLE_USB_CDC in sdkconfig. No included board configs use this and it didn't seem to work (if secondary console was set to the default USB Serial/JTAG then there is no serial output on any port, and if secondary console was set to None then linking fails.) Can be re-added if there's a use case for it. This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <angus@redyak.com.au>
104 lines
3.6 KiB
C
104 lines
3.6 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2021 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "py/runtime.h"
|
|
#include "py/mphal.h"
|
|
#include "usb.h"
|
|
|
|
#if MICROPY_HW_USB_CDC
|
|
|
|
#include "esp_timer.h"
|
|
#ifndef NO_QSTR
|
|
#include "tinyusb.h"
|
|
#include "tusb_cdc_acm.h"
|
|
#endif
|
|
|
|
#define CDC_ITF TINYUSB_CDC_ACM_0
|
|
|
|
static uint8_t usb_rx_buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE];
|
|
|
|
// This is called from FreeRTOS task "tusb_tsk" in espressif__esp_tinyusb (not an ISR).
|
|
static void usb_callback_rx(int itf, cdcacm_event_t *event) {
|
|
// espressif__esp_tinyusb places tinyusb rx data onto freertos ringbuffer which
|
|
// this function forwards onto our stdin_ringbuf.
|
|
for (;;) {
|
|
size_t len = 0;
|
|
esp_err_t ret = tinyusb_cdcacm_read(itf, usb_rx_buf, sizeof(usb_rx_buf), &len);
|
|
if (ret != ESP_OK) {
|
|
break;
|
|
}
|
|
if (len == 0) {
|
|
break;
|
|
}
|
|
for (size_t i = 0; i < len; ++i) {
|
|
if (usb_rx_buf[i] == mp_interrupt_char) {
|
|
mp_sched_keyboard_interrupt();
|
|
} else {
|
|
ringbuf_put(&stdin_ringbuf, usb_rx_buf[i]);
|
|
}
|
|
}
|
|
mp_hal_wake_main_task();
|
|
}
|
|
}
|
|
|
|
void usb_init(void) {
|
|
// Initialise the USB with defaults.
|
|
tinyusb_config_t tusb_cfg = {0};
|
|
ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
|
|
|
|
// Initialise the USB serial interface.
|
|
tinyusb_config_cdcacm_t acm_cfg = {
|
|
.usb_dev = TINYUSB_USBDEV_0,
|
|
.cdc_port = CDC_ITF,
|
|
.rx_unread_buf_sz = 256,
|
|
.callback_rx = &usb_callback_rx,
|
|
#ifdef MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB
|
|
.callback_rx_wanted_char = &MICROPY_HW_USB_CUSTOM_RX_WANTED_CHAR_CB,
|
|
#endif
|
|
#ifdef MICROPY_HW_USB_CUSTOM_LINE_STATE_CB
|
|
.callback_line_state_changed = (tusb_cdcacm_callback_t)&MICROPY_HW_USB_CUSTOM_LINE_STATE_CB,
|
|
#endif
|
|
#ifdef MICROPY_HW_USB_CUSTOM_LINE_CODING_CB
|
|
.callback_line_coding_changed = &MICROPY_HW_USB_CUSTOM_LINE_CODING_CB,
|
|
#endif
|
|
};
|
|
ESP_ERROR_CHECK(tusb_cdc_acm_init(&acm_cfg));
|
|
|
|
}
|
|
|
|
void usb_tx_strn(const char *str, size_t len) {
|
|
// Write out the data to the CDC interface, but only while the USB host is connected.
|
|
uint64_t timeout = esp_timer_get_time() + (uint64_t)(MICROPY_HW_USB_CDC_TX_TIMEOUT_MS * 1000);
|
|
while (tud_cdc_n_connected(CDC_ITF) && len && esp_timer_get_time() < timeout) {
|
|
size_t l = tinyusb_cdcacm_write_queue(CDC_ITF, (uint8_t *)str, len);
|
|
str += l;
|
|
len -= l;
|
|
tud_cdc_n_write_flush(CDC_ITF);
|
|
}
|
|
}
|
|
|
|
#endif // MICROPY_HW_USB_CDC
|