diff --git a/demo/stm32/usb_device/stm32f429igt6/Core/Inc/stm32f4xx_it.h b/demo/stm32/usb_device/stm32f429igt6/Core/Inc/stm32f4xx_it.h index aeed490a..07f8aa0f 100644 --- a/demo/stm32/usb_device/stm32f429igt6/Core/Inc/stm32f4xx_it.h +++ b/demo/stm32/usb_device/stm32f429igt6/Core/Inc/stm32f4xx_it.h @@ -56,8 +56,6 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); -void OTG_HS_EP1_OUT_IRQHandler(void); -void OTG_HS_EP1_IN_IRQHandler(void); void OTG_HS_IRQHandler(void); /* USER CODE BEGIN EFP */ diff --git a/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_hal_msp.c b/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_hal_msp.c index 7532e6ae..4ba8b954 100644 --- a/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_hal_msp.c +++ b/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_hal_msp.c @@ -172,10 +172,6 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd) /* Peripheral clock enable */ __HAL_RCC_USB_OTG_HS_CLK_ENABLE(); /* USB_OTG_HS interrupt Init */ - HAL_NVIC_SetPriority(OTG_HS_EP1_OUT_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(OTG_HS_EP1_OUT_IRQn); - HAL_NVIC_SetPriority(OTG_HS_EP1_IN_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(OTG_HS_EP1_IN_IRQn); HAL_NVIC_SetPriority(OTG_HS_IRQn, 0, 0); HAL_NVIC_EnableIRQ(OTG_HS_IRQn); /* USER CODE BEGIN USB_OTG_HS_MspInit 1 */ @@ -208,8 +204,6 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd) HAL_GPIO_DeInit(GPIOB, GPIO_PIN_14|GPIO_PIN_15); /* USB_OTG_HS interrupt DeInit */ - HAL_NVIC_DisableIRQ(OTG_HS_EP1_OUT_IRQn); - HAL_NVIC_DisableIRQ(OTG_HS_EP1_IN_IRQn); HAL_NVIC_DisableIRQ(OTG_HS_IRQn); /* USER CODE BEGIN USB_OTG_HS_MspDeInit 1 */ diff --git a/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_it.c b/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_it.c index ca7b3ce5..fd35baa9 100644 --- a/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_it.c +++ b/demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_it.c @@ -200,46 +200,18 @@ void SysTick_Handler(void) /******************************************************************************/ /** - * @brief This function handles USB On The Go HS End Point 1 Out global interrupt. + * @brief This function handles USB On The Go HS global interrupt. */ -//void OTG_HS_EP1_OUT_IRQHandler(void) -//{ -// /* USER CODE BEGIN OTG_HS_EP1_OUT_IRQn 0 */ +void OTG_HS_IRQHandler(void) +{ + /* USER CODE BEGIN OTG_HS_IRQn 0 */ -// /* USER CODE END OTG_HS_EP1_OUT_IRQn 0 */ -// HAL_PCD_IRQHandler(&hpcd_USB_OTG_HS); -// /* USER CODE BEGIN OTG_HS_EP1_OUT_IRQn 1 */ + /* USER CODE END OTG_HS_IRQn 0 */ + HAL_PCD_IRQHandler(&hpcd_USB_OTG_HS); + /* USER CODE BEGIN OTG_HS_IRQn 1 */ -// /* USER CODE END OTG_HS_EP1_OUT_IRQn 1 */ -//} - -///** -// * @brief This function handles USB On The Go HS End Point 1 In global interrupt. -// */ -//void OTG_HS_EP1_IN_IRQHandler(void) -//{ -// /* USER CODE BEGIN OTG_HS_EP1_IN_IRQn 0 */ - -// /* USER CODE END OTG_HS_EP1_IN_IRQn 0 */ -// HAL_PCD_IRQHandler(&hpcd_USB_OTG_HS); -// /* USER CODE BEGIN OTG_HS_EP1_IN_IRQn 1 */ - -// /* USER CODE END OTG_HS_EP1_IN_IRQn 1 */ -//} - -///** -// * @brief This function handles USB On The Go HS global interrupt. -// */ -//void OTG_HS_IRQHandler(void) -//{ -// /* USER CODE BEGIN OTG_HS_IRQn 0 */ - -// /* USER CODE END OTG_HS_IRQn 0 */ -// HAL_PCD_IRQHandler(&hpcd_USB_OTG_HS); -// /* USER CODE BEGIN OTG_HS_IRQn 1 */ - -// /* USER CODE END OTG_HS_IRQn 1 */ -//} + /* USER CODE END OTG_HS_IRQn 1 */ +} /* USER CODE BEGIN 1 */ diff --git a/demo/stm32/usb_device/stm32f429igt6/stm32f429igt6.ioc b/demo/stm32/usb_device/stm32f429igt6/stm32f429igt6.ioc index 81b216f4..6c64877c 100644 --- a/demo/stm32/usb_device/stm32f429igt6/stm32f429igt6.ioc +++ b/demo/stm32/usb_device/stm32f429igt6/stm32f429igt6.ioc @@ -1,6 +1,6 @@ #MicroXplorer Configuration settings - do not modify File.Version=6 -GPIO.groupedBy= +GPIO.groupedBy=Group By Peripherals KeepUserPlacement=false Mcu.Family=STM32F4 Mcu.IP0=NVIC @@ -30,8 +30,6 @@ NVIC.ForceEnableDMAVector=true NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false -NVIC.OTG_HS_EP1_IN_IRQn=true\:0\:0\:false\:false\:true\:true\:true -NVIC.OTG_HS_EP1_OUT_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.OTG_HS_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 diff --git a/demo/stm32/usb_device/stm32h743vbt6/Core/Src/main.c b/demo/stm32/usb_device/stm32h743vbt6/Core/Src/main.c index 983cd7bc..3bd96125 100644 --- a/demo/stm32/usb_device/stm32h743vbt6/Core/Src/main.c +++ b/demo/stm32/usb_device/stm32h743vbt6/Core/Src/main.c @@ -91,10 +91,10 @@ void usb_dc_low_level_init(void) PA11 ------> USB_OTG_FS_DM PA12 ------> USB_OTG_FS_DP */ - GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12; + GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; GPIO_InitStruct.Alternate = GPIO_AF10_OTG1_FS; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); diff --git a/demo/stm32/usb_device/stm32h743vbt6/Core/Src/stm32h7xx_hal_msp.c b/demo/stm32/usb_device/stm32h743vbt6/Core/Src/stm32h7xx_hal_msp.c index dd42cc9c..9bc0090a 100644 --- a/demo/stm32/usb_device/stm32h743vbt6/Core/Src/stm32h7xx_hal_msp.c +++ b/demo/stm32/usb_device/stm32h743vbt6/Core/Src/stm32h7xx_hal_msp.c @@ -7,7 +7,7 @@ ****************************************************************************** * @attention * - *

© Copyright (c) 2021 STMicroelectronics. + *

© Copyright (c) 2022 STMicroelectronics. * All rights reserved.

* * This software component is licensed by ST under BSD 3-Clause license, @@ -186,7 +186,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd) GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; GPIO_InitStruct.Alternate = GPIO_AF10_OTG1_FS; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); diff --git a/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvoptx b/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvoptx index 33b081d0..47c1c71a 100644 --- a/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvoptx +++ b/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvoptx @@ -283,6 +283,18 @@ 0 0 0 + ..\..\..\..\cdc_acm_template.c + cdc_acm_template.c + 0 + 0 + + + 2 + 3 + 1 + 0 + 0 + 0 ../Core/Src/main.c main.c 0 @@ -290,7 +302,7 @@ 2 - 3 + 4 1 0 0 @@ -302,7 +314,7 @@ 2 - 4 + 5 1 0 0 @@ -312,18 +324,6 @@ 0 0 - - 2 - 5 - 1 - 0 - 0 - 0 - ..\..\..\..\cdc_acm_template.c - cdc_acm_template.c - 0 - 0 - @@ -667,8 +667,8 @@ 0 0 0 - ..\..\..\..\..\port\synopsys\usb_dc_synopsys.c - usb_dc_synopsys.c + ..\..\..\..\..\port\dwc2\usb_dc_dwc2.c + usb_dc_dwc2.c 0 0 diff --git a/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvprojx b/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvprojx index 7a7b0aa6..5d68a167 100644 --- a/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvprojx +++ b/demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvprojx @@ -338,9 +338,9 @@ 0 - USE_HAL_DRIVER,STM32H750xx,CONFIG_USB_SYNOPSYS_NOVBUSSEN,USB_BASE=0x40080000UL + USE_HAL_DRIVER,STM32H750xx,STM32H7,CONFIG_USB_DWC2_PORT=FS_PORT - ../Core/Inc; ../Drivers/STM32H7xx_HAL_Driver/Inc; ../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32H7xx/Include; ../Drivers/CMSIS/Include; ..\..\..\..\..\class\cdc; ..\..\..\..\..\common; ..\..\..\..\..\core + ../Core/Inc; ../Drivers/STM32H7xx_HAL_Driver/Inc; ../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32H7xx/Include; ../Drivers/CMSIS/Include; ..\..\..\..\..\class\cdc; ..\..\..\..\..\common; ..\..\..\..\..\core @@ -394,6 +394,11 @@ Application/User/Core + + cdc_acm_template.c + 1 + ..\..\..\..\cdc_acm_template.c + main.c 1 @@ -409,11 +414,6 @@ 1 ../Core/Src/stm32h7xx_hal_msp.c - - cdc_acm_template.c - 1 - ..\..\..\..\cdc_acm_template.c - @@ -662,9 +662,9 @@ ..\..\..\..\..\class\cdc\usbd_cdc.c - usb_dc_synopsys.c + usb_dc_dwc2.c 1 - ..\..\..\..\..\port\synopsys\usb_dc_synopsys.c + ..\..\..\..\..\port\dwc2\usb_dc_dwc2.c diff --git a/demo/stm32/usb_device/stm32h743vbt6/stm32h743vbt6.ioc b/demo/stm32/usb_device/stm32h743vbt6/stm32h743vbt6.ioc index cbd84728..355b14f2 100644 --- a/demo/stm32/usb_device/stm32h743vbt6/stm32h743vbt6.ioc +++ b/demo/stm32/usb_device/stm32h743vbt6/stm32h743vbt6.ioc @@ -1,6 +1,6 @@ #MicroXplorer Configuration settings - do not modify File.Version=6 -GPIO.groupedBy= +GPIO.groupedBy=Group By Peripherals KeepUserPlacement=false Mcu.Family=STM32H7 Mcu.IP0=CORTEX_M7 @@ -39,8 +39,12 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false PA10.Mode=Asynchronous PA10.Signal=USART1_RX +PA11.GPIOParameters=GPIO_Speed +PA11.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA11.Mode=Device_Only PA11.Signal=USB_OTG_FS_DM +PA12.GPIOParameters=GPIO_Speed +PA12.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA12.Mode=Device_Only PA12.Signal=USB_OTG_FS_DP PA9.Mode=Asynchronous