|
|
@@ -23,7 +23,7 @@
|
|
|
/* USER CODE BEGIN Includes */
|
|
|
|
|
|
/* USER CODE END Includes */
|
|
|
-extern DMA_HandleTypeDef hdma_usart2_rx;
|
|
|
+extern DMA_HandleTypeDef hdma_usart3_rx;
|
|
|
|
|
|
/* Private typedef -----------------------------------------------------------*/
|
|
|
/* USER CODE BEGIN TD */
|
|
|
@@ -141,23 +141,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
|
|
|
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
|
|
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
|
|
|
|
|
|
- /* USART2 DMA Init */
|
|
|
- /* USART2_RX Init */
|
|
|
- hdma_usart2_rx.Instance = DMA1_Channel6;
|
|
|
- hdma_usart2_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
|
|
|
- hdma_usart2_rx.Init.PeriphInc = DMA_PINC_DISABLE;
|
|
|
- hdma_usart2_rx.Init.MemInc = DMA_MINC_ENABLE;
|
|
|
- hdma_usart2_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
|
|
|
- hdma_usart2_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
|
|
|
- hdma_usart2_rx.Init.Mode = DMA_NORMAL;
|
|
|
- hdma_usart2_rx.Init.Priority = DMA_PRIORITY_HIGH;
|
|
|
- if (HAL_DMA_Init(&hdma_usart2_rx) != HAL_OK)
|
|
|
- {
|
|
|
- Error_Handler();
|
|
|
- }
|
|
|
-
|
|
|
- __HAL_LINKDMA(huart,hdmarx,hdma_usart2_rx);
|
|
|
-
|
|
|
/* USART2 interrupt Init */
|
|
|
HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
|
|
|
HAL_NVIC_EnableIRQ(USART2_IRQn);
|
|
|
@@ -188,6 +171,26 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
|
|
|
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
|
|
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
|
|
|
|
|
+ /* USART3 DMA Init */
|
|
|
+ /* USART3_RX Init */
|
|
|
+ hdma_usart3_rx.Instance = DMA1_Channel3;
|
|
|
+ hdma_usart3_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
|
|
|
+ hdma_usart3_rx.Init.PeriphInc = DMA_PINC_DISABLE;
|
|
|
+ hdma_usart3_rx.Init.MemInc = DMA_MINC_ENABLE;
|
|
|
+ hdma_usart3_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
|
|
|
+ hdma_usart3_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
|
|
|
+ hdma_usart3_rx.Init.Mode = DMA_NORMAL;
|
|
|
+ hdma_usart3_rx.Init.Priority = DMA_PRIORITY_HIGH;
|
|
|
+ if (HAL_DMA_Init(&hdma_usart3_rx) != HAL_OK)
|
|
|
+ {
|
|
|
+ Error_Handler();
|
|
|
+ }
|
|
|
+
|
|
|
+ __HAL_LINKDMA(huart,hdmarx,hdma_usart3_rx);
|
|
|
+
|
|
|
+ /* USART3 interrupt Init */
|
|
|
+ HAL_NVIC_SetPriority(USART3_IRQn, 0, 0);
|
|
|
+ HAL_NVIC_EnableIRQ(USART3_IRQn);
|
|
|
/* USER CODE BEGIN USART3_MspInit 1 */
|
|
|
|
|
|
/* USER CODE END USART3_MspInit 1 */
|
|
|
@@ -235,9 +238,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
|
|
|
*/
|
|
|
HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3);
|
|
|
|
|
|
- /* USART2 DMA DeInit */
|
|
|
- HAL_DMA_DeInit(huart->hdmarx);
|
|
|
-
|
|
|
/* USART2 interrupt DeInit */
|
|
|
HAL_NVIC_DisableIRQ(USART2_IRQn);
|
|
|
/* USER CODE BEGIN USART2_MspDeInit 1 */
|
|
|
@@ -258,6 +258,11 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
|
|
|
*/
|
|
|
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_10|GPIO_PIN_11);
|
|
|
|
|
|
+ /* USART3 DMA DeInit */
|
|
|
+ HAL_DMA_DeInit(huart->hdmarx);
|
|
|
+
|
|
|
+ /* USART3 interrupt DeInit */
|
|
|
+ HAL_NVIC_DisableIRQ(USART3_IRQn);
|
|
|
/* USER CODE BEGIN USART3_MspDeInit 1 */
|
|
|
|
|
|
/* USER CODE END USART3_MspDeInit 1 */
|