From 315843438b375e10e2c607a0cc76c8c84146ad69 Mon Sep 17 00:00:00 2001 From: Willian Chan Date: Wed, 11 Sep 2019 14:31:36 +0800 Subject: [PATCH] [bsp][stm32][f769-disco]Add uart5 to support esp8266 Signed-off-by: Willian Chan --- bsp/stm32/stm32f769-st-disco/README.md | 16 +----- .../board/CubeMX_Config/CubeMX_Config.ioc | 33 +++++++---- .../board/CubeMX_Config/Src/main.c | 44 ++++++++++++++- .../CubeMX_Config/Src/stm32f7xx_hal_msp.c | 56 ++++++++++++++++++- bsp/stm32/stm32f769-st-disco/board/Kconfig | 19 +++++++ 5 files changed, 138 insertions(+), 30 deletions(-) diff --git a/bsp/stm32/stm32f769-st-disco/README.md b/bsp/stm32/stm32f769-st-disco/README.md index a70eb8c010..04b89d9a5e 100644 --- a/bsp/stm32/stm32f769-st-disco/README.md +++ b/bsp/stm32/stm32f769-st-disco/README.md @@ -41,23 +41,11 @@ STM32F769-ST-DISCO 是 ST 推出的一款基于 ARM Cortex-M7 内核的开发板 | **板载外设** | **支持情况** | **备注** | | :----------------- | :----------: | :------------------------------------- | | USB 转串口 | 支持 | UART1 | -| QSPI Flash | 暂不支持 | 即将支持 | -| 以太网 | 暂不支持 | 即将支持 | -| SD卡 | 暂不支持 | 即将支持 | | **片上外设** | **支持情况** | **备注** | | GPIO | 支持 | PA0, PA1... PK7 ---> PIN: 0, 1...167 | -| UART | 支持 | UART1 | -| SPI | 暂不支持 | 即将支持 | -| I2C | 暂不支持 | 即将支持 | -| SDIO | 暂不支持 | 即将支持 | -| RTC | 暂不支持 | 即将支持 | -| PWM | 暂不支持 | 即将支持 | -| USB Device | 暂不支持 | 即将支持 | -| USB Host | 暂不支持 | 即将支持 | -| IWG | 暂不支持 | 即将支持 | -| xxx | 暂不支持 | 即将支持 | +| UART | 支持 | UART1、UART5 | | **扩展模块** | **支持情况** | **备注** | -| xxx 模块 | 支持 | | +| ESP8266 | 支持 | UART5 | ## 使用说明 diff --git a/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/CubeMX_Config.ioc b/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/CubeMX_Config.ioc index 03c4558589..67af414157 100644 --- a/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/CubeMX_Config.ioc +++ b/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/CubeMX_Config.ioc @@ -6,20 +6,23 @@ Mcu.IP0=CORTEX_M7 Mcu.IP1=NVIC Mcu.IP2=RCC Mcu.IP3=SYS -Mcu.IP4=USART1 -Mcu.IPNb=5 +Mcu.IP4=UART5 +Mcu.IP5=USART1 +Mcu.IPNb=6 Mcu.Name=STM32F769NIHx Mcu.Package=TFBGA216 -Mcu.Pin0=PA14 -Mcu.Pin1=PA13 -Mcu.Pin2=PA10 -Mcu.Pin3=PC14/OSC32_IN -Mcu.Pin4=PA9 -Mcu.Pin5=PC15/OSC32_OUT -Mcu.Pin6=PH0/OSC_IN -Mcu.Pin7=PH1/OSC_OUT -Mcu.Pin8=VP_SYS_VS_Systick -Mcu.PinsNb=9 +Mcu.Pin0=PC12 +Mcu.Pin1=PA14 +Mcu.Pin10=VP_SYS_VS_Systick +Mcu.Pin2=PA13 +Mcu.Pin3=PD2 +Mcu.Pin4=PA10 +Mcu.Pin5=PC14/OSC32_IN +Mcu.Pin6=PA9 +Mcu.Pin7=PC15/OSC32_OUT +Mcu.Pin8=PH0/OSC_IN +Mcu.Pin9=PH1/OSC_OUT +Mcu.PinsNb=11 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F769NIHx @@ -45,6 +48,9 @@ PA14.Signal=SYS_JTCK-SWCLK PA9.Locked=true PA9.Mode=Asynchronous PA9.Signal=USART1_TX +PC12.Locked=true +PC12.Mode=Asynchronous +PC12.Signal=UART5_TX PC14/OSC32_IN.Mode=LSE-External-Oscillator PC14/OSC32_IN.Signal=RCC_OSC32_IN PC15/OSC32_OUT.Mode=LSE-External-Oscillator @@ -57,6 +63,9 @@ PCC.Seq0=0 PCC.Series=STM32F7 PCC.Temperature=25 PCC.Vdd=3.3 +PD2.Locked=true +PD2.Mode=Asynchronous +PD2.Signal=UART5_RX PH0/OSC_IN.Mode=HSE-External-Oscillator PH0/OSC_IN.Signal=RCC_OSC_IN PH1/OSC_OUT.Mode=HSE-External-Oscillator diff --git a/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/main.c b/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/main.c index ad2cfb101f..71923e5368 100644 --- a/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/main.c +++ b/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/main.c @@ -43,6 +43,7 @@ /* Private variables ---------------------------------------------------------*/ +UART_HandleTypeDef huart5; UART_HandleTypeDef huart1; /* USER CODE BEGIN PV */ @@ -53,6 +54,7 @@ UART_HandleTypeDef huart1; void SystemClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); +static void MX_UART5_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -92,6 +94,7 @@ int main(void) /* Initialize all configured peripherals */ MX_GPIO_Init(); MX_USART1_UART_Init(); + MX_UART5_Init(); /* USER CODE BEGIN 2 */ /* USER CODE END 2 */ @@ -158,14 +161,50 @@ void SystemClock_Config(void) { Error_Handler(); } - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1|RCC_PERIPHCLK_UART5; PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Uart5ClockSelection = RCC_UART5CLKSOURCE_PCLK1; if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); } } +/** + * @brief UART5 Initialization Function + * @param None + * @retval None + */ +static void MX_UART5_Init(void) +{ + + /* USER CODE BEGIN UART5_Init 0 */ + + /* USER CODE END UART5_Init 0 */ + + /* USER CODE BEGIN UART5_Init 1 */ + + /* USER CODE END UART5_Init 1 */ + huart5.Instance = UART5; + huart5.Init.BaudRate = 115200; + huart5.Init.WordLength = UART_WORDLENGTH_8B; + huart5.Init.StopBits = UART_STOPBITS_1; + huart5.Init.Parity = UART_PARITY_NONE; + huart5.Init.Mode = UART_MODE_TX_RX; + huart5.Init.HwFlowCtl = UART_HWCONTROL_NONE; + huart5.Init.OverSampling = UART_OVERSAMPLING_16; + huart5.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; + huart5.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; + if (HAL_UART_Init(&huart5) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN UART5_Init 2 */ + + /* USER CODE END UART5_Init 2 */ + +} + /** * @brief USART1 Initialization Function * @param None @@ -210,8 +249,9 @@ static void MX_GPIO_Init(void) { /* GPIO Ports Clock Enable */ - __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_GPIOD_CLK_ENABLE(); __HAL_RCC_GPIOH_CLK_ENABLE(); } diff --git a/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/stm32f7xx_hal_msp.c b/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/stm32f7xx_hal_msp.c index f6848b2953..c065225a19 100644 --- a/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/stm32f7xx_hal_msp.c +++ b/bsp/stm32/stm32f769-st-disco/board/CubeMX_Config/Src/stm32f7xx_hal_msp.c @@ -86,7 +86,39 @@ void HAL_MspInit(void) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; - if(huart->Instance==USART1) + if(huart->Instance==UART5) + { + /* USER CODE BEGIN UART5_MspInit 0 */ + + /* USER CODE END UART5_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_UART5_CLK_ENABLE(); + + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_GPIOD_CLK_ENABLE(); + /**UART5 GPIO Configuration + PC12 ------> UART5_TX + PD2 ------> UART5_RX + */ + GPIO_InitStruct.Pin = GPIO_PIN_12; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStruct.Alternate = GPIO_AF8_UART5; + HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); + + GPIO_InitStruct.Pin = GPIO_PIN_2; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStruct.Alternate = GPIO_AF8_UART5; + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + + /* USER CODE BEGIN UART5_MspInit 1 */ + + /* USER CODE END UART5_MspInit 1 */ + } + else if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ @@ -121,7 +153,27 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) */ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) { - if(huart->Instance==USART1) + if(huart->Instance==UART5) + { + /* USER CODE BEGIN UART5_MspDeInit 0 */ + + /* USER CODE END UART5_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_UART5_CLK_DISABLE(); + + /**UART5 GPIO Configuration + PC12 ------> UART5_TX + PD2 ------> UART5_RX + */ + HAL_GPIO_DeInit(GPIOC, GPIO_PIN_12); + + HAL_GPIO_DeInit(GPIOD, GPIO_PIN_2); + + /* USER CODE BEGIN UART5_MspDeInit 1 */ + + /* USER CODE END UART5_MspDeInit 1 */ + } + else if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspDeInit 0 */ diff --git a/bsp/stm32/stm32f769-st-disco/board/Kconfig b/bsp/stm32/stm32f769-st-disco/board/Kconfig index dbebf18976..0b6af50dea 100644 --- a/bsp/stm32/stm32f769-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f769-st-disco/board/Kconfig @@ -29,6 +29,25 @@ menu "On-chip Peripheral Drivers" bool "Enable UART1 RX DMA" depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA default n + + config BSP_UART1_TX_USING_DMA + bool "Enable UART1 TX DMA" + depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA + default n + + config BSP_USING_UART5 + bool "Enable UART5" + default n + + config BSP_UART5_RX_USING_DMA + bool "Enable UART5 RX DMA" + depends on BSP_USING_UART5 && RT_SERIAL_USING_DMA + default n + + config BSP_UART5_TX_USING_DMA + bool "Enable UART5 TX DMA" + depends on BSP_USING_UART5 && RT_SERIAL_USING_DMA + default n endif source "../libraries/HAL_Drivers/Kconfig" -- GitLab