Commit 57722702 authored by 李向行's avatar 李向行

🐞 fix:修改多包故障报文:0x18ECFF03, 0x18EBFF03,为0x1CECFF03, 0x1CEBFF03

parent d5a7c69b
...@@ -6,7 +6,7 @@ CAN_1939_uint16_t g_u1618ECFF03TimeoutCount = 0U; ...@@ -6,7 +6,7 @@ CAN_1939_uint16_t g_u1618ECFF03TimeoutCount = 0U;
CAN_1939_uint16_t g_u1618ECFF00TimeoutCount = 0U; CAN_1939_uint16_t g_u1618ECFF00TimeoutCount = 0U;
const CAN1939_Attribute_st_t stCAN1939Attribute [ CAN1939_SA_MAX ] = { const CAN1939_Attribute_st_t stCAN1939Attribute [ CAN1939_SA_MAX ] = {
{0x18ECFF03, 0x18EBFF03, 5000}, {0x1CECFF03, 0x1CEBFF03, 5000},
{0x18ECFF00, 0x18EBFF00, 5000}, {0x18ECFF00, 0x18EBFF00, 5000},
}; };
CAN_1939_uint8_t u8CAN1939RamData [ CAN1939_RAM_DATA_LEN ]; CAN_1939_uint8_t u8CAN1939RamData [ CAN1939_RAM_DATA_LEN ];
...@@ -143,12 +143,12 @@ void CAN_1939_Process(void) ...@@ -143,12 +143,12 @@ void CAN_1939_Process(void)
void CAN_1939_0X18ECFF03_MSG_CKB_ON_RECEIVE(unsigned char CopyData []) void CAN_1939_0X18ECFF03_MSG_CKB_ON_RECEIVE(unsigned char CopyData [])
{ {
CAN_1939_Receive_Data(CAN1939_SA_03, 0x18ECFF03, CopyData); CAN_1939_Receive_Data(CAN1939_SA_03, 0x1CECFF03, CopyData);
CAN_J1939_Multipacket_Service(CAN1939_SA_03); CAN_J1939_Multipacket_Service(CAN1939_SA_03);
} }
void CAN_1939_0X18EBFF03_MSG_CKB_ON_RECEIVE(unsigned char CopyData []) void CAN_1939_0X18EBFF03_MSG_CKB_ON_RECEIVE(unsigned char CopyData [])
{ {
CAN_1939_Receive_Data(CAN1939_SA_03, 0x18EBFF03, CopyData); CAN_1939_Receive_Data(CAN1939_SA_03, 0x1CEBFF03, CopyData);
CAN_J1939_Multipacket_Service(CAN1939_SA_03); CAN_J1939_Multipacket_Service(CAN1939_SA_03);
} }
void CAN_1939_0X18FECA03_MSG_CKB_ON_RECEIVE(unsigned char CopyData []) void CAN_1939_0X18FECA03_MSG_CKB_ON_RECEIVE(unsigned char CopyData [])
......
...@@ -249,7 +249,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] = ...@@ -249,7 +249,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 5000ul,
0x18ECFF03ul, 0x1CECFF03ul,
(( void * )0), (( void * )0),
(( void * )CAN_1939_0X18ECFF03_MSG_CKB_ON_RECEIVE), (( void * )CAN_1939_0X18ECFF03_MSG_CKB_ON_RECEIVE),
(( void * )0), (( void * )0),
...@@ -259,7 +259,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] = ...@@ -259,7 +259,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 5000ul,
0x18EBFF03ul, 0x1CEBFF03ul,
(( void * )0), (( void * )0),
(( void * )CAN_1939_0X18EBFF03_MSG_CKB_ON_RECEIVE), (( void * )CAN_1939_0X18EBFF03_MSG_CKB_ON_RECEIVE),
(( void * )0), (( void * )0),
...@@ -1174,12 +1174,12 @@ uint8_t Get_CAN_CH0_ID_18FF9DF1_Sig_Sec_TBOX(void) ...@@ -1174,12 +1174,12 @@ uint8_t Get_CAN_CH0_ID_18FF9DF1_Sig_Sec_TBOX(void)
uint8_t Get_CAN_CH0_ID_18ECFF03_Sig_test(void) uint8_t Get_CAN_CH0_ID_18ECFF03_Sig_test(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_can18ECFF03_Msg_Count, 0u) >> 0u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_can1CECFF03_Msg_Count, 0u) >> 0u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_18EBFF03_Sig_test(void) uint8_t Get_CAN_CH0_ID_18EBFF03_Sig_test(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_can18EBFF03_Msg_Count, 0u) >> 0u) & 0x01u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_can1CEBFF03_Msg_Count, 0u) >> 0u) & 0x01u));
} }
uint8_t Get_CAN_CH0_ID_18EBFF00_Sig_test(void) uint8_t Get_CAN_CH0_ID_18EBFF00_Sig_test(void)
...@@ -1293,11 +1293,11 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID) ...@@ -1293,11 +1293,11 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
//case CAN_CH0_ID_NM18FFA000_Msg: //case CAN_CH0_ID_NM18FFA000_Msg:
//u8Result = CAN_CH0_ID_NM18FFA000_Msg_Count; //u8Result = CAN_CH0_ID_NM18FFA000_Msg_Count;
break; break;
case CAN_CH0_ID_can18ECFF03_Msg: case CAN_CH0_ID_can1CECFF03_Msg:
u8Result = CAN_CH0_ID_can18ECFF03_Msg_Count; u8Result = CAN_CH0_ID_can1CECFF03_Msg_Count;
break; break;
case CAN_CH0_ID_can18EBFF03_Msg: case CAN_CH0_ID_can1CEBFF03_Msg:
u8Result = CAN_CH0_ID_can18EBFF03_Msg_Count; u8Result = CAN_CH0_ID_can1CEBFF03_Msg_Count;
break; break;
case CAN_CH0_ID_can18EBFF00_Msg: case CAN_CH0_ID_can18EBFF00_Msg:
u8Result = CAN_CH0_ID_can18EBFF00_Msg_Count; u8Result = CAN_CH0_ID_can18EBFF00_Msg_Count;
......
...@@ -36,8 +36,8 @@ typedef enum ...@@ -36,8 +36,8 @@ typedef enum
CAN_CH0_ID_can18F00503_Msg_Count, CAN_CH0_ID_can18F00503_Msg_Count,
CAN_CH0_ID_can18FF9DF1_Msg_Count, CAN_CH0_ID_can18FF9DF1_Msg_Count,
//CAN_CH0_ID_NM18FFA000_Msg_Count, //CAN_CH0_ID_NM18FFA000_Msg_Count,
CAN_CH0_ID_can18ECFF03_Msg_Count, CAN_CH0_ID_can1CECFF03_Msg_Count,
CAN_CH0_ID_can18EBFF03_Msg_Count, CAN_CH0_ID_can1CEBFF03_Msg_Count,
CAN_CH0_ID_can18EBFF00_Msg_Count, CAN_CH0_ID_can18EBFF00_Msg_Count,
CAN_CH0_ID_can18ECFF00_Msg_Count, CAN_CH0_ID_can18ECFF00_Msg_Count,
CAN_CH0_ID_can18FE5BE8_Msg_Count, CAN_CH0_ID_can18FE5BE8_Msg_Count,
...@@ -79,8 +79,8 @@ extern const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX ...@@ -79,8 +79,8 @@ extern const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX
#define CAN_CH0_ID_can18F00503_Msg 0x18F00503ul #define CAN_CH0_ID_can18F00503_Msg 0x18F00503ul
#define CAN_CH0_ID_can18FF9DF1_Msg 0x18FF9DF1ul #define CAN_CH0_ID_can18FF9DF1_Msg 0x18FF9DF1ul
//#define CAN_CH0_ID_NM18FFA000_Msg 0x18FFA000ul //#define CAN_CH0_ID_NM18FFA000_Msg 0x18FFA000ul
#define CAN_CH0_ID_can18ECFF03_Msg 0x18ECFF03ul #define CAN_CH0_ID_can1CECFF03_Msg 0x1CECFF03ul
#define CAN_CH0_ID_can18EBFF03_Msg 0x18EBFF03ul #define CAN_CH0_ID_can1CEBFF03_Msg 0x1CEBFF03ul
#define CAN_CH0_ID_can18EBFF00_Msg 0x18EBFF00ul #define CAN_CH0_ID_can18EBFF00_Msg 0x18EBFF00ul
#define CAN_CH0_ID_can18ECFF00_Msg 0x18ECFF00ul #define CAN_CH0_ID_can18ECFF00_Msg 0x18ECFF00ul
#define CAN_CH0_ID_can18FE5BE8_Msg 0x18FE5BE8ul #define CAN_CH0_ID_can18FE5BE8_Msg 0x18FE5BE8ul
......
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