Merge pull request #9889 from dhalbert/espressif-CIRCUITPY_USB_DEVICE_INSTANCE

tannewt · web-flow · commit 79fd8b7efcbc · 2024-12-16T12:17:29.000-08:00
CIRCUITPY_USB_DEVICE_INSTANCE should default to 0 on most Espressif boards
diff --git a/ports/espressif/boards/espressif_esp32p4_function_ev/mpconfigboard.h b/ports/espressif/boards/espressif_esp32p4_function_ev/mpconfigboard.h
@@ -15,3 +15,6 @@
 
 #define DEFAULT_UART_BUS_RX         (&pin_GPIO38)
 #define DEFAULT_UART_BUS_TX         (&pin_GPIO37)
+
+// Use the second USB device (numbered 0 and 1)
+#define CIRCUITPY_USB_DEVICE_INSTANCE 1
diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
@@ -17,8 +17,6 @@
 
 #define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (1)
 
-#define CIRCUITPY_USB_DEVICE_INSTANCE 1
-
 #include "py/circuitpy_mpconfig.h"
 
 #define MICROPY_NLR_SETJMP                  (1)
