mirror of
https://github.com/micropython/micropython.git
synced 2026-01-04 11:10:14 +01:00
4766f5680e
Fixes problems with USB-CDC state after soft reset if USBDevice has been active with the default USB-CDC driver also enabled. This also brings ESP32 behaviour in line with RP2 and other ports, where boot.py is executed before the runtime USB device is initialised. This allows setting up a custom USB device in boot.py. There is still a bug here, because calling tud_disconnect() doesn't cause any UNPLUG or BUS_RESET events to arrive from TinyUSB - which means the USB device state stays out of sync until we call mp_usbd_init() again... This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <angus@redyak.com.au> Signed-off-by: Angus Gratton <angus@redyak.com.au>
77 lines
2.5 KiB
C
77 lines
2.5 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_ENABLE_USBDEV
|
|
|
|
#include "esp_mac.h"
|
|
#include "esp_rom_gpio.h"
|
|
#include "esp_private/usb_phy.h"
|
|
|
|
#include "shared/tinyusb/mp_usbd.h"
|
|
|
|
static usb_phy_handle_t phy_hdl;
|
|
|
|
void usb_phy_init(void) {
|
|
// ref: https://github.com/espressif/esp-usb/blob/4b6a798d0bed444fff48147c8dcdbbd038e92892/device/esp_tinyusb/tinyusb.c
|
|
|
|
// Configure USB PHY
|
|
usb_phy_config_t phy_conf = {
|
|
.controller = USB_PHY_CTRL_OTG,
|
|
.otg_mode = USB_OTG_MODE_DEVICE,
|
|
};
|
|
// Internal USB PHY
|
|
phy_conf.target = USB_PHY_TARGET_INT;
|
|
|
|
// Init ESP USB Phy
|
|
usb_new_phy(&phy_conf, &phy_hdl);
|
|
}
|
|
|
|
#if CONFIG_IDF_TARGET_ESP32S3
|
|
void usb_usj_mode(void) {
|
|
// Switch the USB PHY back to Serial/Jtag mode, disabling OTG support
|
|
// This should be run before jumping to bootloader.
|
|
usb_del_phy(phy_hdl);
|
|
usb_phy_config_t phy_conf = {
|
|
.controller = USB_PHY_CTRL_SERIAL_JTAG,
|
|
};
|
|
usb_new_phy(&phy_conf, &phy_hdl);
|
|
}
|
|
#endif
|
|
|
|
void mp_usbd_port_get_serial_number(char *serial_buf) {
|
|
// use factory default MAC as serial ID
|
|
uint8_t mac[8];
|
|
esp_efuse_mac_get_default(mac);
|
|
MP_STATIC_ASSERT(sizeof(mac) * 2 <= MICROPY_HW_USB_DESC_STR_MAX);
|
|
mp_usbd_hex_str(serial_buf, mac, sizeof(mac));
|
|
}
|
|
|
|
#endif // MICROPY_HW_ENABLE_USBDEV
|