Merge remote-tracking branch 'origin' into dev

code/Sources/Protocol/inc/CAN_Communication_Matrix.h

@@ -2333,6 +2333,7 @@ extern volatile uint8_t             CANMsg18FDC40BStatus;
 static const uint8_t  CANMsg18FDC40BInit[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18FDC40BTimeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18FDC40BMask[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+<<<<<<< HEAD
 /******************************************************************************
 ICM5
 ID:0x0C0B2A17
@@ -2397,6 +2398,8 @@ extern volatile uint8_t             CANMsg18A92A17Status;
 static const uint8_t  CANMsg18A92A17Init[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18A92A17Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18A92A17Mask[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+=======
+>>>>>>> origin
 /*****************************************************************************************************************************************************************************
 报文属性预定义
 *****************************************************************************************************************************************************************************/ 
@@ -2523,7 +2526,11 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
   { EBS5,   	  	  	 CANMsg18FDC40B.Msg,  8,	  8,  CAN_MSG_Rx,  CAN_MSG_CYCLE,	 1000,	  0,   &CANMsg18FDC40BStatus,	  CANMsg18FDC40BInit,    CANMsg18FDC40BTimeout,   CANMsg18FDC40BMask,},
 	/*==========================================================================================================================================================================*/
 };
+<<<<<<< HEAD
 #define   CAN_TX_MSG_NUM                    10
+=======
+#define   CAN_TX_MSG_NUM                    8
+>>>>>>> origin
 #define   CAN_RX_MSG_NUM                    44
 
 #endif

code/Sources/Protocol/src/CAN_Communication_Matrix.c

@@ -236,6 +236,7 @@ volatile uint8_t     CANMsg18FFEB4EStatus;
 //EBS5
 volatile CANMsg18FDC40BUnion             CANMsg18FDC40B;
 volatile uint8_t     CANMsg18FDC40BStatus;
+<<<<<<< HEAD
 
 //ICM5
 volatile CANMsg0C0B2A17Union             CANMsg0C0B2A17;
@@ -244,3 +245,5 @@ volatile uint8_t     CANMsg0C0B2A17Status;
 //ICM6
 volatile CANMsg18A92A17Union             CANMsg18A92A17;
 volatile uint8_t     CANMsg18A92A17Status;
+=======
+>>>>>>> origin