Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RT_RMR42E
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
时昊
RT_RMR42E
Commits
90819ea8
Commit
90819ea8
authored
Feb 16, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:新增报文0x234及相关信号
parent
7e98b832
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
CAN_CH0_CAN_Communication_Matrix.c
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+18
-0
CAN_CH0_CAN_Communication_Matrix.h
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h
+3
-0
No files found.
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @
90819ea8
...
@@ -156,6 +156,16 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
...
@@ -156,6 +156,16 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
(
CAN_0x225_Receive
),
(
CAN_0x225_Receive
),
((
void
*
)
0
),
((
void
*
)
0
),
},
},
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
1000ul
,
0x234ul
,
((
void
*
)
0
),
((
void
*
)
0
),
((
void
*
)
0
),
},
};
};
void
System_Indicator_ON_callback
(
canlib_uint8_t
CopyData
[])
void
System_Indicator_ON_callback
(
canlib_uint8_t
CopyData
[])
{
{
...
@@ -381,6 +391,11 @@ uint8_t Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3(void)
...
@@ -381,6 +391,11 @@ uint8_t Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3(void)
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_CAN_0x225_Msg_Count
,
7u
)
>>
1u
)
&
0x01u
));
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_CAN_0x225_Msg_Count
,
7u
)
>>
1u
)
&
0x01u
));
}
}
uint8_t
Get_CAN_CH0_ID_234_Sig_EMS_EngineOilLow
(
void
)
{
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
CAN_CH0
,
CAN_CH0_ID_CAN_0x234_Msg_Count
,
3u
)
>>
4u
)
&
0x01u
));
}
uint8_t
Co_Can_ConvertSubID_CAN_CH0
(
uint32_t
MsgID
)
uint8_t
Co_Can_ConvertSubID_CAN_CH0
(
uint32_t
MsgID
)
{
{
uint8_t
u8Result
=
CAN_CH0_ID_TOTAL_MAX
;
uint8_t
u8Result
=
CAN_CH0_ID_TOTAL_MAX
;
...
@@ -428,6 +443,9 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
...
@@ -428,6 +443,9 @@ uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID)
case
CAN_CH0_ID_CAN_0x225_Msg
:
case
CAN_CH0_ID_CAN_0x225_Msg
:
u8Result
=
CAN_CH0_ID_CAN_0x225_Msg_Count
;
u8Result
=
CAN_CH0_ID_CAN_0x225_Msg_Count
;
break
;
break
;
case
CAN_CH0_ID_CAN_0x234_Msg
:
u8Result
=
CAN_CH0_ID_CAN_0x234_Msg_Count
;
break
;
default:
default:
u8Result
=
CAN_CH0_ID_TOTAL_MAX
;
u8Result
=
CAN_CH0_ID_TOTAL_MAX
;
break
;
break
;
...
...
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h
View file @
90819ea8
...
@@ -25,6 +25,7 @@ typedef enum
...
@@ -25,6 +25,7 @@ typedef enum
CAN_CH0_ID_CAN_0x134_Msg_Count
,
CAN_CH0_ID_CAN_0x134_Msg_Count
,
CAN_CH0_ID_CAN_0x220_Msg_Count
,
CAN_CH0_ID_CAN_0x220_Msg_Count
,
CAN_CH0_ID_CAN_0x225_Msg_Count
,
CAN_CH0_ID_CAN_0x225_Msg_Count
,
CAN_CH0_ID_CAN_0x234_Msg_Count
,
CAN_CH0_ID_TOTAL_MAX
,
CAN_CH0_ID_TOTAL_MAX
,
}
CAN_CH0_CAN_MSG_ID_t
;
}
CAN_CH0_CAN_MSG_ID_t
;
...
@@ -67,6 +68,7 @@ extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
...
@@ -67,6 +68,7 @@ extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
#define CAN_CH0_ID_CAN_0x134_Msg 0x134ul
#define CAN_CH0_ID_CAN_0x134_Msg 0x134ul
#define CAN_CH0_ID_CAN_0x220_Msg 0x220ul
#define CAN_CH0_ID_CAN_0x220_Msg 0x220ul
#define CAN_CH0_ID_CAN_0x225_Msg 0x225ul
#define CAN_CH0_ID_CAN_0x225_Msg 0x225ul
#define CAN_CH0_ID_CAN_0x234_Msg 0x234ul
...
@@ -111,6 +113,7 @@ extern uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void);
...
@@ -111,6 +113,7 @@ extern uint8_t Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc(void);
extern
uint8_t
Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage
(
void
);
extern
uint8_t
Get_CAN_CH0_ID_134_Sig_SMCU_ErrorGrage
(
void
);
extern
uint8_t
Get_CAN_CH0_ID_220_Sig_VCU_KeySts
(
void
);
extern
uint8_t
Get_CAN_CH0_ID_220_Sig_VCU_KeySts
(
void
);
extern
uint8_t
Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3
(
void
);
extern
uint8_t
Get_CAN_CH0_ID_225_Sig_VCU_EmsFltLv3
(
void
);
extern
uint8_t
Get_CAN_CH0_ID_234_Sig_EMS_EngineOilLow
(
void
);
...
...
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