Fixed USB endpoint speed issue w/ configuration setting

Author: U-ANALOG\BHurst

ports/analog/Makefile

@@ -82,7 +82,7 @@ INC += \
 	-I$(PERIPH_SRC)/ICC \
 	-I$(PERIPH_SRC)/TMR \
 	-I$(PERIPH_SRC)/RTC \
-	-I$(PERIPH_SRC)/UART \
+	-I$(PERIPH_SRC)/UART
 
 INC += -I$(CMSIS_ROOT)/Device/Maxim/$(MCU_VARIANT_UPPER)/Source/GCC
 
@@ -116,12 +116,12 @@ SRC_MAX32 += \
 	$(PERIPH_SRC)/TMR/tmr_$(DIE_TYPE).c \
 	$(PERIPH_SRC)/UART/uart_common.c \
 	$(PERIPH_SRC)/UART/uart_$(DIE_TYPE).c \
-	$(PERIPH_SRC)/UART/uart_revb.c \
+	$(PERIPH_SRC)/UART/uart_revb.c
 
 SRC_C += $(SRC_MAX32) \
 			boards/$(BOARD)/board.c \
 			boards/$(BOARD)/pins.c \
-			peripherals/$(MCU_VARIANT_LOWER)/pins.c \
+			peripherals/$(MCU_VARIANT_LOWER)/pins.c
 
 # *******************************************************************************
 ### Compiler & Linker Flags ###
@@ -145,11 +145,11 @@ CFLAGS += -D$(MCU_VARIANT_UPPER) \
 			-DTARGET_REV=0x4131 \
 			-DTARGET=$(MCU_VARIANT_UPPER) \
 			-DIAR_PRAGMAS=0 \
-			-DRISCV_LOAD=0 \
-			# -DFLASH_ORIGIN=0x10000000 \
-			# -DFLASH_SIZE=0x340000 \
-			# -DSRAM_ORIGIN=0x20000000 \
-			# -DSRAM_SIZE=0x100000 \
+			-DRISCV_LOAD=0
+# -DFLASH_ORIGIN=0x10000000 \
+# -DFLASH_SIZE=0x340000 \
+# -DSRAM_ORIGIN=0x20000000 \
+# -DSRAM_SIZE=0x100000
 
 CPU_CORE=cortex-m4
 CFLAGS += -mthumb -mcpu=$(CPU_CORE) -mfloat-abi=softfp -mfpu=fpv4-sp-d16
@@ -171,8 +171,9 @@ ifeq ($(CIRCUITPY_TINYUSB),1)
 CFLAGS += \
 	-DCFG_TUSB_MCU=OPT_MCU_$(MCU_VARIANT_UPPER) \
 	-DBOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED \
-	-DCFG_TUSB_OS=OPT_OS_NONE \
-	-DCFG_TUD_TASK_QUEUE_SZ=32
+	-DCFG_TUSB_OS=OPT_OS_NONE
+
+# -DCFG_TUD_TASK_QUEUE_SZ=32
 
 # Add TinyUSB sources
 INC += -I../../lib/tinyusb/src
@@ -182,15 +183,20 @@ endif
 
 ifeq ($(CIRCUITPY_USB_DEVICE),1)
 CFLAGS += \
-	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
 	-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
-	-DCFG_TUD_MSC_BUFSIZE=4096 \
-	-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
-	-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
-	-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \
-	-DCFG_TUD_VENDOR_TX_BUFSIZE=128
+	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
+	-DCFG_TUD_MSC_BUFSIZE=4096
 endif
 
+ifdef CIRCUITPY_USB_VENDOR
+CFLASGS += \
+	-DCFG_TUD_VENDOR_RX_BUFSIZE=1024 \
+	-DCFG_TUD_VENDOR_TX_BUFSIZE=1024
+endif
+
+# -DCFG_TUD_MIDI_RX_BUFSIZE=128
+# -DCFG_TUD_MIDI_TX_BUFSIZE=128
+
 SRC_C += \
 	boards/$(BOARD)/board.c \
 	background.c \
@@ -208,7 +214,7 @@ CFLAGS += -Wno-error=unused-parameter \
 			-Wno-error=lto-type-mismatch \
 			-Wno-error=cast-align \
 			-Wno-error=nested-externs \
-			-Wno-error=sign-compare \
+			-Wno-error=sign-compare
 
 ENTRY = Reset_Handler
 LDFLAGS += $(CFLAGS) --entry $(ENTRY) -Wl,-nostdlib -Wl,-T,$(LINKERFILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections

ports/analog/boards/APARD/mpconfigboard.mk

@@ -4,23 +4,25 @@
 #
 # SPDX-License-Identifier: MIT
 
-INTERNAL_FLASH_FILESYSTEM = 1
+INTERNAL_FLASH_FILESYSTEM=1
 # FLASH: 	0x10000000 to 0x10300000 (ARM)
 # SRAM: 	0x20000000 to 0x20100000
 
-USB_MANUFACTURER="Analog Devices, Inc."
-USB_PRODUCT="MAX32690 APARD"
-
 # Use 0x0456 for Analog Devices, Inc.; 0B6A for Maxim
 USB_VID=0x0456
 # USB_VID=0x0B6A
 USB_PID=0x003C
+USB_MANUFACTURER="Analog Devices, Inc."
+USB_PRODUCT="MAX32690 APARD"
+# Num endpt pairs for a given device
+USB_NUM_ENDPOINT_PAIRS=12
+USB_HIGHSPEED=1
 
 # NOTE: Not implementing external flash for now
 # CFLAGS+=-DEXT_FLASH_MX25
 
 # define 13 bytes UID for memory safety (buffer gets passed as a raw ptr)
-COMMON_HAL_MCU_PROCESSOR_UID_LENGTH = 13
+COMMON_HAL_MCU_PROCESSOR_UID_LENGTH=13
 
 MCU_SERIES=max32
 MCU_VARIANT=max32690

ports/analog/mpconfigport.mk

@@ -7,7 +7,6 @@
 CHIP_FAMILY ?= max32
 
 # Necessary to build CircuitPython
-USB_NUM_ENDPOINT_PAIRS ?= 0
 LONGINT_IMPL ?= MPZ
 INTERNAL_LIBM ?= 1