Merge branch 'CJL' into 'dev'

Cjl

See merge request !108

Firmware/Source/Application/CAN_User/Can_App.c

@@ -20,7 +20,7 @@ void CAN_TX_Flag_Init(void)
 void CAN_TX_Count_Init(void)
 {
     //CAN_TX_Count = 0;
-    CAN_Send_Cound = 0;
+    //CAN_Send_Cound = 0;
     if(AliveCount_KL30_ResettingFlag > 0)
     {
         AliveCount_KL30_ResettingFlag = 0;

Firmware/Source/Application/CAN_User/Can_User.c

@@ -13,6 +13,7 @@ uint8_t CAN_Send_Cound = 0;
 
 void Can_Init(void)
 {
+    CAN_Send_Cound = 0;
     CAN_TX_Count_Init();
     can_config_st_t Can_Config;
     Can_Config.ch = CAN_CH_0;
@@ -325,6 +326,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
     {
         CanRxInitflag = 1;
         CAN_TX_Count_Init();
+        CAN_Send_Cound = 0;
         if (RSCAN0Busoff.Status == RSCAN0_BUS_STABLE)
         {
             RSCAN0Busoff.Status = RSCAN0_BUS_OFF_LV1;
@@ -347,6 +349,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
                 }
                 //需调用CAN中止函数，中止所有硬件buf内要发送的数据
                 CAN_TX_Count_Init();
+                CAN_Send_Cound = 0;
                 Can_QuickTimer_Init();
                 reset_busoff(CAN_CH_0);
             }
@@ -360,6 +363,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
                 RSCAN0Busoff.Timer = 0U;
                 //需调用CAN中止函数，中止所有硬件buf内要发送的数据
                 CAN_TX_Count_Init();
+                CAN_Send_Cound = 0;
                 Can_QuickTimer_Init();
                 reset_busoff(CAN_CH_0);
             }

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -108,6 +108,7 @@ static void Power_KL30_Init(void)
 extern uint32_t PowerIgnOffTimeLine;
 static void Power_Wakeup_Init(void)
 {
+    CAN_Send_Cound = 0;
     PowerIgnOffTimeLine = 0;
     //RTE_CLOCK_Select_Start();
     Gpio_Init(Gpio_WakeUp_Init);

Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/CAN/rte_can.c

@@ -3,7 +3,7 @@
 #include "isr.h"
 #include "rte_can.h"
 
-extern void Can_Rx_Cak(CanTxRxMsg *Msg);
+
 CANBuffList_t CanBufList = {0};
 CANMSG_Type* CANMSG;
 CanTxRxMsg CAN_RecvMsg;

Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/CAN/rte_can.h

@@ -45,4 +45,5 @@ extern uint8_t rte_can_deinit(CAN_CH ch);
 extern uint8_t get_can_busoff(CAN_CH ch);
 extern uint8_t reset_busoff(CAN_CH ch);
 extern uint8_t Read_RingBuff(CanTxRxMsg *data);
+extern void Can_Rx_Cak(CanTxRxMsg *Msg);
 #endif /* RTE_CAN_H_ */