f8bd6778c8
CONFIG_USB_OTG_SUPPORTED is automatically set by the ESP-IDF when the chip supports USB-OTG, which is the case for the ESP32-S2 and ESP32-S3. When trying to use the JTAG console with these chips, it would not work because our USB implementation will take over control over the USB port, breaking the JTAG console in the process. Thus, when the board is configured to use the JTAG console, we should not enable our USB console support. Additionally, this change also frees up UART0 when an USB-based console is configured, since there's no reason to prevent (re)configuration of UART0 for other uses in that case. Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
101 lines
3.6 KiB
C
101 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 CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
|
|
|
|
#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];
|
|
|
|
static void usb_callback_rx(int itf, cdcacm_event_t *event) {
|
|
// TODO: what happens if more chars come in during this function, are they lost?
|
|
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]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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 = &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 // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
|