1.将原来使用的串口2改为使用串口1
This commit is contained in:
2026-07-27 14:14:11 +08:00
parent 2c3e2c4dc2
commit 1e3c618fd2
172 changed files with 1234 additions and 9998 deletions
+12 -11
View File
@@ -22,6 +22,8 @@
#include "stm32f1xx_it.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
#include "bsp_Uart.h"
#include "os_timer.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -185,7 +187,7 @@ void SysTick_Handler(void)
/* USER CODE BEGIN SysTick_IRQn 0 */
OsTimer_Increment(1);
COM_Uart1.Rx_TimeIncrementInt(&COM_Uart1,1);
COM_Uart2.Rx_TimeIncrementInt(&COM_Uart2,1);
// COM_Uart2.Rx_TimeIncrementInt(&COM_Uart2,1);
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
/* USER CODE BEGIN SysTick_IRQn 1 */
@@ -201,21 +203,20 @@ void SysTick_Handler(void)
/******************************************************************************/
/**
* @brief This function handles USART2 global interrupt.
* @brief This function handles USART1 global interrupt.
*/
void USART2_IRQHandler(void)
void USART1_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */
if(LL_USART_IsActiveFlag_RXNE(USART2))
/* USER CODE BEGIN USART1_IRQn 0 */
if(LL_USART_IsActiveFlag_RXNE(USART1))
{
// // жϱ־
LL_USART_IsActiveFlag_RXNE(USART2);
COM_Uart2.Rx_IdleInt(&COM_Uart2); //յֽڣͬʱر־Զ
LL_USART_IsActiveFlag_RXNE(USART1);
COM_Uart1.Rx_IdleInt(&COM_Uart1);
}
/* USER CODE END USART2_IRQn 0 */
/* USER CODE BEGIN USART2_IRQn 1 */
/* USER CODE END USART1_IRQn 0 */
/* USER CODE BEGIN USART1_IRQn 1 */
/* USER CODE END USART2_IRQn 1 */
/* USER CODE END USART1_IRQn 1 */
}
/* USER CODE BEGIN 1 */