Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
IVECO_NS216
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
IVECO_NS216
Commits
57722702
Commit
57722702
authored
Jul 02, 2025
by
李向行
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改多包故障报文:0x18ECFF03, 0x18EBFF03,为0x1CECFF03, 0x1CEBFF03
parent
d5a7c69b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
CAN_1939_user.c
source/Appliciation/CAN_App/CAN_1939_user.c
+3
-3
CAN_CH0_CAN_Communication_Matrix.c
...e/Appliciation/CAN_App/CAN_CH0_CAN_Communication_Matrix.c
+8
-8
CAN_CH0_CAN_Communication_Matrix.h
...e/Appliciation/CAN_App/CAN_CH0_CAN_Communication_Matrix.h
+4
-4
No files found.
source/Appliciation/CAN_App/CAN_1939_user.c
View file @
57722702
...
...
@@ -6,7 +6,7 @@ CAN_1939_uint16_t g_u1618ECFF03TimeoutCount = 0U;
CAN_1939_uint16_t
g_u1618ECFF00TimeoutCount
=
0U
;
const
CAN1939_Attribute_st_t
stCAN1939Attribute
[
CAN1939_SA_MAX
]
=
{
{
0x1
8ECFF03
,
0x18
EBFF03
,
5000
},
{
0x1
CECFF03
,
0x1C
EBFF03
,
5000
},
{
0x18ECFF00
,
0x18EBFF00
,
5000
},
};
CAN_1939_uint8_t
u8CAN1939RamData
[
CAN1939_RAM_DATA_LEN
];
...
...
@@ -143,12 +143,12 @@ void CAN_1939_Process(void)
void
CAN_1939_0X18ECFF03_MSG_CKB_ON_RECEIVE
(
unsigned
char
CopyData
[])
{
CAN_1939_Receive_Data
(
CAN1939_SA_03
,
0x1
8
ECFF03
,
CopyData
);
CAN_1939_Receive_Data
(
CAN1939_SA_03
,
0x1
C
ECFF03
,
CopyData
);
CAN_J1939_Multipacket_Service
(
CAN1939_SA_03
);
}
void
CAN_1939_0X18EBFF03_MSG_CKB_ON_RECEIVE
(
unsigned
char
CopyData
[])
{
CAN_1939_Receive_Data
(
CAN1939_SA_03
,
0x1
8
EBFF03
,
CopyData
);
CAN_1939_Receive_Data
(
CAN1939_SA_03
,
0x1
C
EBFF03
,
CopyData
);
CAN_J1939_Multipacket_Service
(
CAN1939_SA_03
);
}
void
CAN_1939_0X18FECA03_MSG_CKB_ON_RECEIVE
(
unsigned
char
CopyData
[])
...
...
source/Appliciation/CAN_App/CAN_CH0_CAN_Communication_Matrix.c
View file @
57722702
...
...
@@ -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
},
5000ul
,
0x1
8
ECFF03ul
,
0x1
C
ECFF03ul
,
((
void
*
)
0
),
((
void
*
)
CAN_1939_0X18ECFF03_MSG_CKB_ON_RECEIVE
),
((
void
*
)
0
),
...
...
@@ -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
},
5000ul
,
0x1
8
EBFF03ul
,
0x1
C
EBFF03ul
,
((
void
*
)
0
),
((
void
*
)
CAN_1939_0X18EBFF03_MSG_CKB_ON_RECEIVE
),
((
void
*
)
0
),
...
...
@@ -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
)
{
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_can1
8
ECFF03_Msg_Count
,
0u
)
>>
0u
)
&
0x01u
));
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_can1
C
ECFF03_Msg_Count
,
0u
)
>>
0u
)
&
0x01u
));
}
uint8_t
Get_CAN_CH0_ID_18EBFF03_Sig_test
(
void
)
{
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_can1
8
EBFF03_Msg_Count
,
0u
)
>>
0u
)
&
0x01u
));
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_can1
C
EBFF03_Msg_Count
,
0u
)
>>
0u
)
&
0x01u
));
}
uint8_t
Get_CAN_CH0_ID_18EBFF00_Sig_test
(
void
)
...
...
@@ -1293,11 +1293,11 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
//case CAN_CH0_ID_NM18FFA000_Msg:
//u8Result = CAN_CH0_ID_NM18FFA000_Msg_Count;
break
;
case
CAN_CH0_ID_can1
8
ECFF03_Msg
:
u8Result
=
CAN_CH0_ID_can1
8
ECFF03_Msg_Count
;
case
CAN_CH0_ID_can1
C
ECFF03_Msg
:
u8Result
=
CAN_CH0_ID_can1
C
ECFF03_Msg_Count
;
break
;
case
CAN_CH0_ID_can1
8
EBFF03_Msg
:
u8Result
=
CAN_CH0_ID_can1
8
EBFF03_Msg_Count
;
case
CAN_CH0_ID_can1
C
EBFF03_Msg
:
u8Result
=
CAN_CH0_ID_can1
C
EBFF03_Msg_Count
;
break
;
case
CAN_CH0_ID_can18EBFF00_Msg
:
u8Result
=
CAN_CH0_ID_can18EBFF00_Msg_Count
;
...
...
source/Appliciation/CAN_App/CAN_CH0_CAN_Communication_Matrix.h
View file @
57722702
...
...
@@ -36,8 +36,8 @@ typedef enum
CAN_CH0_ID_can18F00503_Msg_Count
,
CAN_CH0_ID_can18FF9DF1_Msg_Count
,
//CAN_CH0_ID_NM18FFA000_Msg_Count,
CAN_CH0_ID_can1
8
ECFF03_Msg_Count
,
CAN_CH0_ID_can1
8
EBFF03_Msg_Count
,
CAN_CH0_ID_can1
C
ECFF03_Msg_Count
,
CAN_CH0_ID_can1
C
EBFF03_Msg_Count
,
CAN_CH0_ID_can18EBFF00_Msg_Count
,
CAN_CH0_ID_can18ECFF00_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
#define CAN_CH0_ID_can18F00503_Msg 0x18F00503ul
#define CAN_CH0_ID_can18FF9DF1_Msg 0x18FF9DF1ul
//#define CAN_CH0_ID_NM18FFA000_Msg 0x18FFA000ul
#define CAN_CH0_ID_can1
8ECFF03_Msg 0x18
ECFF03ul
#define CAN_CH0_ID_can1
8EBFF03_Msg 0x18
EBFF03ul
#define CAN_CH0_ID_can1
CECFF03_Msg 0x1C
ECFF03ul
#define CAN_CH0_ID_can1
CEBFF03_Msg 0x1C
EBFF03ul
#define CAN_CH0_ID_can18EBFF00_Msg 0x18EBFF00ul
#define CAN_CH0_ID_can18ECFF00_Msg 0x18ECFF00ul
#define CAN_CH0_ID_can18FE5BE8_Msg 0x18FE5BE8ul
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment