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
0c128970
Commit
0c128970
authored
Mar 03, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:混动车型修改电源条件判断
parent
6c520d78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
14 deletions
+17
-14
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+13
-12
Can_RX_User.h
Firmware/Source/Application/CAN_User/Can_RX_User.h
+1
-1
System_Monitor_User.c
...are/Source/Component/System_Monitor/System_Monitor_User.c
+3
-1
No files found.
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
0c128970
...
@@ -215,6 +215,7 @@ uint8_t Get_CAN_Num_SMCU_ErrorGrage(void)
...
@@ -215,6 +215,7 @@ uint8_t Get_CAN_Num_SMCU_ErrorGrage(void)
}
}
uint8_t
g_powerState
=
0U
;
uint8_t
Get_CAN_Power_State
(
void
)
uint8_t
Get_CAN_Power_State
(
void
)
{
{
...
@@ -257,20 +258,20 @@ uint8_t Get_CAN_Power_State(void)
...
@@ -257,20 +258,20 @@ uint8_t Get_CAN_Power_State(void)
state
=
POWER_CHECK_NULL
;
state
=
POWER_CHECK_NULL
;
}
}
#else
#else
if
((
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
))
switch
(
g_powerState
)
{
if
((
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x220_Msg
))
==
CAN_SIG_NORMAL
)
&&
(
Get_CAN_CH0_ID_220_Sig_VCU_KeySts
()
==
1U
))
{
state
=
KEY_ACC
;
}
else
{
state
=
PKEY_ON
;
}
}
else
{
{
case
0
:
state
=
KEY_OFF
;
break
;
case
1
:
state
=
PKEY_ON
;
break
;
case
2
:
state
=
KEY_ACC
;
break
;
default:
state
=
KEY_OFF
;
state
=
KEY_OFF
;
break
;
}
}
#endif
#endif
return
state
;
return
state
;
...
...
Firmware/Source/Application/CAN_User/Can_RX_User.h
View file @
0c128970
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#include "Components.h"
#include "Components.h"
extern
uint8_t
g_powerState
;
extern
uint8_t
Get_CAN_Num_BMCU_ErrorGrage
(
void
);
extern
uint8_t
Get_CAN_Num_BMCU_ErrorGrage
(
void
);
...
...
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @
0c128970
...
@@ -115,21 +115,23 @@ monitorlib_uint8_t System_LINE_KL15(void)
...
@@ -115,21 +115,23 @@ monitorlib_uint8_t System_LINE_KL15(void)
u8KL15
=
0u
;
u8KL15
=
0u
;
}
}
#else
#else
if
((
Sys_Read_KL15_Voltage
()
>=
5500u
)
&&
(
Sys_Read_KL30_Voltage
()
>=
5500u
))
if
((
Sys_Read_KL15_Voltage
()
>=
5500u
)
&&
(
Sys_Read_KL30_Voltage
()
>=
5500u
))
{
{
if
((
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x220_Msg
))
==
CAN_SIG_NORMAL
)
&&
(
Get_CAN_CH0_ID_220_Sig_VCU_KeySts
()
==
1U
))
if
((
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x220_Msg
))
==
CAN_SIG_NORMAL
)
&&
(
Get_CAN_CH0_ID_220_Sig_VCU_KeySts
()
==
1U
))
{
{
u8KL15
=
1U
;
u8KL15
=
1U
;
g_powerState
=
2U
;
}
}
else
else
{
{
u8KL15
=
0U
;
u8KL15
=
0U
;
g_powerState
=
1U
;
}
}
}
}
else
else
{
{
u8KL15
=
0U
;
u8KL15
=
0U
;
g_powerState
=
0U
;
}
}
#endif
#endif
...
...
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