From 920ee2b4367edab997bffb90f2d0f81721353440 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sun, 15 Dec 2024 17:47:59 -0500 Subject: [PATCH] CIRCUITPY_USB_DEVICE_INSTANCE should default to 0 on most Espressif boards --- .../boards/espressif_esp32p4_function_ev/mpconfigboard.h | 3 +++ ports/espressif/mpconfigport.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/espressif/boards/espressif_esp32p4_function_ev/mpconfigboard.h b/ports/espressif/boards/espressif_esp32p4_function_ev/mpconfigboard.h index b62439a31990..646fb62e5623 100644 --- 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 index 81c799b79bb9..98c1986240b7 100644 --- 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)