Merge pull request #20 from CarletonURocketry/usb-support

USB CDCACM support

Author: linguini1

configs/autoboot/defconfig

@@ -32,12 +32,14 @@ CONFIG_ARMV7M_ICACHE=y
 CONFIG_BCH=y
 CONFIG_BOARDCTL=y
 CONFIG_BOARDCTL_MKRD=y
+CONFIG_BOARDCTL_USBDEVCTRL=y
 CONFIG_BOARD_COREDUMP_SYSLOG=y
 CONFIG_BOARD_CUSTOM_LEDS=y
 CONFIG_BOARD_INITTHREAD_STACKSIZE=2048
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=79943
 CONFIG_BUILTIN=y
+CONFIG_CDCACM=y
 CONFIG_COREDUMP=y
 CONFIG_DEBUG_ANALOG=y
 CONFIG_DEBUG_ANALOG_ERROR=y
@@ -109,9 +111,11 @@ CONFIG_START_YEAR=2024
 CONFIG_STM32H7_ADC2=y
 CONFIG_STM32H7_ADC2_SAMPLE_FREQUENCY=10
 CONFIG_STM32H7_ADC2_TIMTRIG=1
+CONFIG_STM32H7_HSI48=y
 CONFIG_STM32H7_I2C1=y
 CONFIG_STM32H7_I2C2=y
 CONFIG_STM32H7_I2C4=y
+CONFIG_STM32H7_OTGFS=y
 CONFIG_STM32H7_SDMMC1=y
 CONFIG_STM32H7_TIM1=y
 CONFIG_STM32H7_TIM1_CH3OUT=y
@@ -134,6 +138,7 @@ CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART2_BAUD=57600
 CONFIG_USART3_BAUD=9600
 CONFIG_USART3_RXBUFSIZE=1024
+CONFIG_USBDEV=y
 CONFIG_USENSOR=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_PKTRADIO=y

configs/debug/defconfig

@@ -27,12 +27,15 @@ CONFIG_ARMV7M_DCACHE=y
 CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
+CONFIG_BOARDCTL_USBDEVCTRL=y
 CONFIG_BOARD_COREDUMP_SYSLOG=y
 CONFIG_BOARD_CUSTOM_LEDS=y
 CONFIG_BOARD_INITTHREAD_STACKSIZE=2048
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=79943
 CONFIG_BUILTIN=y
+CONFIG_CDCACM=y
+CONFIG_CDCACM_VENDORSTR="InSpace Josh"
 CONFIG_COREDUMP=y
 CONFIG_DEBUG_ANALOG=y
 CONFIG_DEBUG_ANALOG_ERROR=y
@@ -133,9 +136,11 @@ CONFIG_START_YEAR=2024
 CONFIG_STM32H7_ADC2=y
 CONFIG_STM32H7_ADC2_SAMPLE_FREQUENCY=10
 CONFIG_STM32H7_ADC2_TIMTRIG=1
+CONFIG_STM32H7_HSI48=y
 CONFIG_STM32H7_I2C1=y
 CONFIG_STM32H7_I2C2=y
 CONFIG_STM32H7_I2C4=y
+CONFIG_STM32H7_OTGFS=y
 CONFIG_STM32H7_SDMMC1=y
 CONFIG_STM32H7_TIM1=y
 CONFIG_STM32H7_TIM1_CH3OUT=y
@@ -166,6 +171,7 @@ CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USART2_BAUD=57600
 CONFIG_USART3_BAUD=9600
 CONFIG_USART3_RXBUFSIZE=1024
+CONFIG_USBDEV=y
 CONFIG_USENSOR=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_PKTRADIO=y

src/CMakeLists.txt

@@ -44,6 +44,10 @@ if(CONFIG_ADC)
     list(APPEND SRCS stm32_adc.c)
 endif()
 
+if(CONFIG_USBDEV)
+    list(APPEND SRCS stm32_usb.c)
+endif()
+
 
 target_sources(board PRIVATE ${SRCS})
 

src/Makefile

@@ -21,7 +21,6 @@
 include $(TOPDIR)/Make.defs
 
 CSRCS = stm32_boot.c stm32_bringup.c stm32_appinitialize.c
-# CSRCS += stm32_usb.c TODO add back after USART working
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += stm32_autoleds.c
@@ -47,4 +46,8 @@ ifeq ($(CONFIG_ADC),y)
 CSRCS += stm32_adc.c
 endif
 
+ifeq ($(CONFIG_USBDEV),y)	
+CSRCS += stm32_usb.c
+endif
+
 include $(TOPDIR)/boards/Board.mk