esp32: Enable machine.USBDevice to configure USB at runtime.

sebromero · dpgeorge · commit 5f2d05d41755 · 2024-12-16T11:41:40.000+11:00
This adds support for `machine.USBDevice` to S2 and S3 boards.

Signed-off-by: Sebastian Romero &lt;s.romero@arduino.cc&gt;
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
@@ -78,6 +78,7 @@ if(MICROPY_PY_TINYUSB)
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
     )
 
     list(APPEND MICROPY_INC_TINYUSB
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
@@ -183,6 +183,10 @@ void mp_task(void *pvParameter) {
     mp_thread_deinit();
     #endif
 
+    #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+    mp_usbd_deinit();
+    #endif
+
     gc_sweep_all();
 
     // Free any native code pointers that point to iRAM.
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -215,6 +215,10 @@
 #else
 #define MICROPY_HW_USB_VID  (CONFIG_TINYUSB_DESC_CUSTOM_VID)
 #endif
+
+#ifndef MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE    (1) // Support machine.USBDevice
+#endif
 #endif
 
 #ifndef MICROPY_HW_USB_PID

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ if(MICROPY_PY_TINYUSB)`
`78`	`78`	`${MICROPY_DIR}/shared/tinyusb/mp_usbd.c`
`79`	`79`	`${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c`
`80`	`80`	`${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c`
	`81`	`+ ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c`
`81`	`82`	`)`
`82`	`83`
`83`	`84`	`list(APPEND MICROPY_INC_TINYUSB`