From 6126f6a78b14297cefb02f06ba58806767d424b5 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 12:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/FP0' into kNet
---
Src/stm32f0xx_it.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Src/stm32f0xx_it.c b/Src/stm32f0xx_it.c
index ae44ae7..6306514 100644
--- a/Src/stm32f0xx_it.c
+++ b/Src/stm32f0xx_it.c
@@ -149,7 +149,7 @@
void DMA1_Channel2_3_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Channel2_3_IRQn 0 */
- Uart1DmaInts++;
+ Uart1Stat.DMACount++;
if (LL_DMA_IsActiveFlag_TC2(DMA1))
{
@@ -171,7 +171,7 @@
else
{
Uart1Stat.DMASendLen=0;
- Uart1Stat.Sending=0;
+ Uart1Stat.bSending=0;
}
}
/* USER CODE END DMA1_Channel2_3_IRQn 0 */
@@ -188,7 +188,7 @@
void DMA1_Channel4_5_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Channel4_5_IRQn 0 */
- Uart2DmaInts++;
+ Uart2Stat.DMACount++;
if (LL_DMA_IsActiveFlag_TC4(DMA1))
{
LL_DMA_ClearFlag_TC4(DMA1);
@@ -212,7 +212,7 @@
*/
{
Uart2Stat.DMASendLen=0;
- Uart2Stat.Sending=0;
+ Uart2Stat.bSending=0;
}
}
/* USER CODE END DMA1_Channel4_5_IRQn 0 */
@@ -262,14 +262,14 @@
Uart1Stat.OverRunCount++;
}
if (LL_USART_IsEnabledIT_IDLE(USART1)&&LL_USART_IsActiveFlag_IDLE(USART1))
- {//接收完成
+ {//鎺ユ敹瀹屾垚
LL_USART_ClearFlag_IDLE(USART1);
Uart1RecvDone();
}
/* USER CODE END USART1_IRQn 0 */
/* USER CODE BEGIN USART1_IRQn 1 */
if (LL_USART_IsActiveFlag_TC(USART1))
- {//发送完成
+ {//鍙戦�佸畬鎴�
LL_USART_ClearFlag_TC(USART1);
Uart1SendDone();
}
@@ -297,14 +297,14 @@
Uart2Stat.OverRunCount++;
}
if (LL_USART_IsEnabledIT_IDLE(USART2)&&LL_USART_IsActiveFlag_IDLE(USART2))
- {//接收完成
+ {//鎺ユ敹瀹屾垚
LL_USART_ClearFlag_IDLE(USART2);
Uart2RecvDone();
}
/* USER CODE END USART2_IRQn 0 */
/* USER CODE BEGIN USART2_IRQn 1 */
if (LL_USART_IsActiveFlag_TC(USART2))
- {//发送完成
+ {//鍙戦�佸畬鎴�
LL_USART_ClearFlag_TC(USART2);
Uart2SendDone();
}
--
Gitblit v1.9.1