From 2364f06313efb8eb97d4ae741a31cdd2efc175d2 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 16:05:50 +0800
Subject: [PATCH] KBus fix after merget together
---
Src/stm32f0xx_it.c | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/Src/stm32f0xx_it.c b/Src/stm32f0xx_it.c
index 7d8e4dc..6306514 100644
--- a/Src/stm32f0xx_it.c
+++ b/Src/stm32f0xx_it.c
@@ -127,6 +127,21 @@
/* For the available peripheral interrupt handler names, */
/* please refer to the startup file (startup_stm32f0xx.s). */
/******************************************************************************/
+/**
+ * @brief This function handles TIM6 global interrupt.
+ */
+void TIM6_IRQHandler(void)
+{
+ /* USER CODE BEGIN TIM6_IRQn 0 */
+ if (LL_TIM_IsActiveFlag_UPDATE(TIM6)) { LL_TIM_ClearFlag_UPDATE(TIM6);}
+
+// KMem.SDD[46]+=1000;
+// KMem.SDT[93] = LL_TIM_GetCounter(TIM6);
+ /* USER CODE END TIM6_IRQn 0 */
+ /* USER CODE BEGIN TIM6_IRQn 1 */
+
+ /* USER CODE END TIM6_IRQn 1 */
+}
/**
* @brief This function handles DMA1 channel 2 and 3 interrupts.
@@ -134,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))
{
@@ -156,7 +171,7 @@
else
{
Uart1Stat.DMASendLen=0;
- Uart1Stat.Sending=0;
+ Uart1Stat.bSending=0;
}
}
/* USER CODE END DMA1_Channel2_3_IRQn 0 */
@@ -173,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);
@@ -197,7 +212,7 @@
*/
{
Uart2Stat.DMASendLen=0;
- Uart2Stat.Sending=0;
+ Uart2Stat.bSending=0;
}
}
/* USER CODE END DMA1_Channel4_5_IRQn 0 */
@@ -211,6 +226,17 @@
}
/* USER CODE END DMA1_Channel4_5_IRQn 1 */
}
+
+void SPI1_IRQHandler(void)
+{
+ /* USER CODE BEGIN SPI1_IRQn 0 */
+ SPI1_IRQ_CallBack();
+ /* USER CODE END SPI1_IRQn 0 */
+ /* USER CODE BEGIN SPI1_IRQn 1 */
+
+ /* USER CODE END SPI1_IRQn 1 */
+}
+
/**
* @brief This function handles USART1 global interrupt.
*/
@@ -236,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();
}
@@ -271,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