调整上一版本CAN移植BUG

ghs/group/Driver.gpj

@@ -5,7 +5,7 @@
 .\Analog_Signals\Analog_Circuits.c
 .\Analog_Signals\Analog_Signals.c
 .\CAN\RSCAN.c
-.\CAN\RSCAN_Table.h
+.\CAN\RSCAN_Table.c
 .\Clock\Clock.c
 .\Clock\RTC.c
 .\Common\debugger.c

source/Application/RTE/RTE_CAN.c

@@ -40,48 +40,39 @@ void Can_Init(void)
         /* Sys_Startup_Init */
         /*50304*/
         /* Channel0 Filter Data */
-        CANLLCCh0NMIDRange[0] = 0x680UL;
-        CANLLCCh0NMIDRange[1] = 0x6FFUL;
-
-        CANLLCCh0MsgIDList[0] = DIAG_ID_Rx_PHY;
-        CANLLCCh0MsgIDList[1] = DIAG_ID_Rx_FUN;
 
         for (i = 2u; i < (ID_TOTAL_MAX + 2u); i++)
         {
             CANLLCCh0MsgIDList[i] = CAN_MSG_CONST_ARRAY[i - 2].MSG_Identifier;
         }
 
-        CANLLCCh0OwnIDList[0] = 0x26DUL;
-        CANLLCCh0OwnIDList[1] = 0x330UL;
-        CANLLCCh0OwnIDList[2] = 0x331UL;
-        CANLLCCh0OwnIDList[3] = 0x332UL;
-
         /* Channel0 Filter Data configeration */
-        CANLLCCh0Filter.NM0StdFilter.CfgType = CANFD_FILTER_ID_RANGE;
-        CANLLCCh0Filter.NM0StdFilter.IDNum = (DIM(CANLLCCh0NMIDRange) / 2U);
-        CANLLCCh0Filter.NM0StdFilter.pIDs = CANLLCCh0NMIDRange;
-        CANLLCCh0Filter.NM0ExtFilter.CfgType = CANFD_FILTER_N_A;
 
-        CANLLCCh0Filter.Msg0StdFilter.CfgType = CANFD_FILTER_ID_LIST;
-        CANLLCCh0Filter.Msg0StdFilter.IDNum = ID_TOTAL_MAX + 2u;
-        CANLLCCh0Filter.Msg0StdFilter.pIDs = CANLLCCh0MsgIDList;
-        CANLLCCh0Filter.Msg0ExtFilter.CfgType = CANFD_FILTER_N_A;
 
-        CANLLCCh0Filter.Diag0StdFilter.CfgType = CANFD_FILTER_ID_LIST;
-        CANLLCCh0Filter.Diag0StdFilter.IDNum = DIM(CANLLCCh0OwnIDList);
-        CANLLCCh0Filter.Diag0StdFilter.pIDs = CANLLCCh0OwnIDList;
-        CANLLCCh0Filter.Diag0ExtFilter.CfgType = CANFD_FILTER_N_A;
-
-        CH0_IDFilterNum = CANLLCCh0Filter.NM0StdFilter.IDNum;
-        CH0_IDFilterNum = CH0_IDFilterNum + CANLLCCh0Filter.Msg0StdFilter.IDNum;
-        CH0_IDFilterNum = CH0_IDFilterNum + CANLLCCh0Filter.Diag0StdFilter.IDNum;
+        CH0_IDFilterNum = 24;
 
         IDFilterNum = (uint32_t)(CH0_IDFilterNum & 0xFFUL);
         IDFilterNum |= (uint32_t)((0 & 0xFFUL) << 8U);
         IDFilterNum |= (uint32_t)((0 & 0xFFUL) << 16U);
 
         CANLLCCh0Filter.pfCAN0DataIndCb = Can_Read_Msg;
+        CANLLCCh0Filter.pfCAN0DataConfirmCb = Can_Confirm;
+
+        CANLLCCh0Filter.pfCAN1DataIndCb = (void *)0;
+        CANLLCCh0Filter.pfCAN1DataConfirmCb = (void *)0;
 
+        CANLLCCh0Filter.pfCAN2DataIndCb = (void *)0;
+        CANLLCCh0Filter.pfCAN2DataConfirmCb = (void *)0;
+
+        CANLLCCh0Filter.CH0_Enable = 1u;
+        CANLLCCh0Filter.CH1_Enable = 0u;
+        CANLLCCh0Filter.CH2_Enable = 0u;
+
+        CANLLCCh0Filter.CH0_Std_Ext = 0u;
+        CANLLCCh0Filter.CH1_Std_Ext = 0u;
+        CANLLCCh0Filter.CH2_Std_Ext = 0u;
+
+        GPIO_OUT_PORT00_PIN00 = 0U; //RSCAN0_CH0_STB
         RSCAN0_CH_Init(&CANLLCCh0Filter, IDFilterNum);
         Can_Init_Lock = 0x55AAu;
     }