yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update cubemx ioc

Browse Source
This commit is contained in:
sakumisu
2022-06-21 21:44:21 +08:00
parent 1ecd17e156
commit 0bafea923b
9 changed files with 44 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/stm32/usb_device/stm32f429igt6/Core/Inc/stm32f4xx_it.h
View File

@@ -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 */

6
demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_hal_msp.c
View File

@@ -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 */

46
demo/stm32/usb_device/stm32f429igt6/Core/Src/stm32f4xx_it.c
View File

@@ -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 */

4
demo/stm32/usb_device/stm32f429igt6/stm32f429igt6.ioc
View File

@@ -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

4
demo/stm32/usb_device/stm32h743vbt6/Core/Src/main.c
View File

@@ -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);

4
demo/stm32/usb_device/stm32h743vbt6/Core/Src/stm32h7xx_hal_msp.c
View File

@@ -7,7 +7,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* 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);

32
demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvoptx
View File

@@ -283,6 +283,18 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\cdc_acm_template.c</PathWithFileName>
<FilenameWithoutPath>cdc_acm_template.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>../Core/Src/main.c</PathWithFileName>
<FilenameWithoutPath>main.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -290,7 +302,7 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -302,7 +314,7 @@
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>4</FileNumber>
<FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -312,18 +324,6 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\cdc_acm_template.c</PathWithFileName>
<FilenameWithoutPath>cdc_acm_template.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
@@ -667,8 +667,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\..\port\synopsys\usb_dc_synopsys.c</PathWithFileName>
<FilenameWithoutPath>usb_dc_synopsys.c</FilenameWithoutPath>
<PathWithFileName>..\..\..\..\..\port\dwc2\usb_dc_dwc2.c</PathWithFileName>
<FilenameWithoutPath>usb_dc_dwc2.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>

18
demo/stm32/usb_device/stm32h743vbt6/MDK-ARM/stm32h743vbt6.uvprojx
View File

@@ -338,9 +338,9 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER,STM32H750xx,CONFIG_USB_SYNOPSYS_NOVBUSSEN,USB_BASE=0x40080000UL</Define>
<Define>USE_HAL_DRIVER,STM32H750xx,STM32H7,CONFIG_USB_DWC2_PORT=FS_PORT</Define>
<Undefine></Undefine>
<IncludePath>../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</IncludePath>
<IncludePath>../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</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -394,6 +394,11 @@
<Group>
<GroupName>Application/User/Core</GroupName>
<Files>
<File>
<FileName>cdc_acm_template.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\cdc_acm_template.c</FilePath>
</File>
<File>
<FileName>main.c</FileName>
<FileType>1</FileType>
@@ -409,11 +414,6 @@
<FileType>1</FileType>
<FilePath>../Core/Src/stm32h7xx_hal_msp.c</FilePath>
</File>
<File>
<FileName>cdc_acm_template.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\cdc_acm_template.c</FilePath>
</File>
</Files>
</Group>
<Group>
@@ -662,9 +662,9 @@
<FilePath>..\..\..\..\..\class\cdc\usbd_cdc.c</FilePath>
</File>
<File>
<FileName>usb_dc_synopsys.c</FileName>
<FileName>usb_dc_dwc2.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\..\port\synopsys\usb_dc_synopsys.c</FilePath>
<FilePath>..\..\..\..\..\port\dwc2\usb_dc_dwc2.c</FilePath>
</File>
</Files>
</Group>

6
demo/stm32/usb_device/stm32h743vbt6/stm32h743vbt6.ioc
View File

@@ -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