Skip to content

W
WZ-EF01
Commit e6a39d2e authored by 崔立宝's avatar 崔立宝
Browse files
Options

修改合并冲突上传时未保存文件修改

parent 11b7bcc9
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 10 deletions
code/Sources/Protocol/inc/CAN_Communication_Matrix.h
View file @ e6a39d2e
...@@ -2333,7 +2333,6 @@ extern volatile uint8_t CANMsg18FDC40BStatus; ...@@ -2333,7 +2333,6 @@ extern volatile uint8_t CANMsg18FDC40BStatus;
static const uint8_t CANMsg18FDC40BInit[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; 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 CANMsg18FDC40BTimeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18FDC40BMask[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 ICM5
ID:0x0C0B2A17 ID:0x0C0B2A17
...@@ -2398,8 +2397,6 @@ extern volatile uint8_t CANMsg18A92A17Status; ...@@ -2398,8 +2397,6 @@ extern volatile uint8_t CANMsg18A92A17Status;
static const uint8_t CANMsg18A92A17Init[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; 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 CANMsg18A92A17Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static const uint8_t CANMsg18A92A17Mask[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; static const uint8_t CANMsg18A92A17Mask[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
=======
>>>>>>> origin
/***************************************************************************************************************************************************************************** /*****************************************************************************************************************************************************************************
报文属性预定义 报文属性预定义
*****************************************************************************************************************************************************************************/ *****************************************************************************************************************************************************************************/
...@@ -2526,11 +2523,7 @@ static const CANMsgAttrStruct CANMsgAttrTable[] = ...@@ -2526,11 +2523,7 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
{ EBS5, CANMsg18FDC40B.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FDC40BStatus, CANMsg18FDC40BInit, CANMsg18FDC40BTimeout, CANMsg18FDC40BMask,}, { 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 10
=======
#define CAN_TX_MSG_NUM 8
>>>>>>> origin
#define CAN_RX_MSG_NUM 44 #define CAN_RX_MSG_NUM 44
#endif #endif
code/Sources/Protocol/src/CAN_Communication_Matrix.c
View file @ e6a39d2e
...@@ -236,7 +236,6 @@ volatile uint8_t CANMsg18FFEB4EStatus; ...@@ -236,7 +236,6 @@ volatile uint8_t CANMsg18FFEB4EStatus;
//EBS5 //EBS5
volatile CANMsg18FDC40BUnion CANMsg18FDC40B; volatile CANMsg18FDC40BUnion CANMsg18FDC40B;
volatile uint8_t CANMsg18FDC40BStatus; volatile uint8_t CANMsg18FDC40BStatus;
<<<<<<< HEAD
//ICM5 //ICM5
volatile CANMsg0C0B2A17Union CANMsg0C0B2A17; volatile CANMsg0C0B2A17Union CANMsg0C0B2A17;
...@@ -245,5 +244,3 @@ volatile uint8_t CANMsg0C0B2A17Status; ...@@ -245,5 +244,3 @@ volatile uint8_t CANMsg0C0B2A17Status;
//ICM6 //ICM6
volatile CANMsg18A92A17Union CANMsg18A92A17; volatile CANMsg18A92A17Union CANMsg18A92A17;
volatile uint8_t CANMsg18A92A17Status; volatile uint8_t CANMsg18A92A17Status;
=======
>>>>>>> origin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment