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
dad8fcb5
Commit
dad8fcb5
authored
Feb 20, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:增加混动车型座椅检测指示灯触发逻辑
parent
78ead314
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
12 deletions
+52
-12
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+21
-1
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+29
-11
Telltales_user.h
Firmware/Source/Component/Telltales/Telltales_user.h
+2
-0
No files found.
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
dad8fcb5
...
...
@@ -386,7 +386,7 @@ void CAN_0x38E_Receive(uint8_t CopyData [])
void
CAN_0x220_Receive
(
uint8_t
CopyData
[])
{
System_Indicator_CANFlag
=
0
;
#if (PART_NUMBER == G54_A01)
if
((
Get_CAN_CH0_ID_220_Sig_VCU_GrassSwSts
()
==
1U
)
&&
(
g_GrassSwStatus
==
0U
))
{
...
...
@@ -406,6 +406,26 @@ void CAN_0x220_Receive(uint8_t CopyData [])
{
g_GrassSwCount
=
0U
;
}
if
((
Get_CAN_CH0_ID_220_Sig_VCU_SeatSts
()
==
1U
)
&&
(
g_SeatStatus
==
0U
))
{
if
(
g_SeatCount
<
3U
)
{
g_SeatCount
++
;
}
}
else
if
((
Get_CAN_CH0_ID_220_Sig_VCU_SeatSts
()
==
0U
)
&&
(
g_SeatStatus
==
1U
))
{
if
(
g_SeatCount
<
3U
)
{
g_SeatCount
++
;
}
}
else
{
g_SeatCount
=
0U
;
}
#endif
}
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
dad8fcb5
...
...
@@ -72,7 +72,8 @@ uint8_t g_OverLoadStatus[9] = {0,0,0,0,0,0,0,0,0};
uint8_t
g_OverLoadCount
[
9
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
uint8_t
g_GrassSwStatus
=
0U
;
uint8_t
g_GrassSwCount
=
0U
;
uint8_t
g_SeatStatus
=
0U
;
uint8_t
g_SeatCount
=
0U
;
const
LED_Attribute_st
LED_Attribute
[
LED_Max
]
=
{
/* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */
...
...
@@ -123,6 +124,8 @@ void Telltales_Init(void)
g_VoltLowCount
=
0U
;
g_GrassSwStatus
=
0U
;
g_GrassSwCount
=
0U
;
g_SeatStatus
=
0U
;
g_SeatCount
=
0U
;
Telltales_KL30_Wakeup_Init
(
Tel_Mem
,
LED_Attribute
,
&
m_ExtPara
);
}
...
...
@@ -296,7 +299,7 @@ static Tellib_uint16_t LED_Grass_Full_Judgement(void)
LED_STATE
=
(
Tellib_uint16_t
)
g_GrassSwStatus
;
#endif
return
LED_STATE
;
}
static
void
LED_Grass_Full_Execution
(
Tellib_uint16_t
led_status
)
...
...
@@ -397,15 +400,30 @@ static void LED_READY_Execution(Tellib_uint16_t led_status)
static
Tellib_uint16_t
LED_Seat_Detection_Judgement
(
void
)
{
Tellib_uint16_t
LED_STATE
=
0u
;
Tellib_uint8_t
Signal1
=
Get_CAN_Num_MMCU_SeatDetectState
();
if
((
Signal1
==
0x1
)
&&
openLED_flag
)
{
LED_STATE
=
1
;
}
else
{
LED_STATE
=
0
;
}
#if (PART_NUMBER == RMR42E_60)
Tellib_uint8_t
Signal1
=
Get_CAN_Num_MMCU_SeatDetectState
();
if
((
Signal1
==
0x1
)
&&
openLED_flag
)
{
LED_STATE
=
1
;
}
else
{
LED_STATE
=
0
;
}
#else
if
((
g_SeatStatus
==
0U
)
&&
(
g_SeatCount
>=
3U
))
{
g_SeatStatus
=
1U
;
}
else
if
((
g_SeatStatus
==
1U
)
&&
(
g_SeatCount
>=
3U
))
{
g_SeatStatus
=
0U
;
}
LED_STATE
=
(
Tellib_uint16_t
)
g_SeatStatus
;
#endif
return
LED_STATE
;
}
static
void
LED_Seat_Detection_Execution
(
Tellib_uint16_t
led_status
)
...
...
Firmware/Source/Component/Telltales/Telltales_user.h
View file @
dad8fcb5
...
...
@@ -53,6 +53,8 @@ extern uint8_t g_OverLoadStatus[9];
extern
uint8_t
g_OverLoadCount
[
9
];
extern
uint8_t
g_GrassSwStatus
;
extern
uint8_t
g_GrassSwCount
;
extern
uint8_t
g_SeatStatus
;
extern
uint8_t
g_SeatCount
;
// extern Tellib_uint8_t Auto_Start_Stop ;
...
...
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