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
78ead314
Commit
78ead314
authored
Feb 20, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:增加0x220CAN接收回调报文,增加混动车型草满指示灯工作逻辑,删除无用代码
parent
98c25fb6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
57 additions
and
14 deletions
+57
-14
CAN_CH0_CAN_Communication_Matrix.c
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+1
-5
CAN_CH0_CAN_Communication_Matrix.h
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h
+0
-1
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+26
-0
Can_RX_User.h
Firmware/Source/Application/CAN_User/Can_RX_User.h
+1
-0
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+27
-8
Telltales_user.h
Firmware/Source/Component/Telltales/Telltales_user.h
+2
-0
No files found.
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @
78ead314
...
...
@@ -517,7 +517,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
1000ul
,
0x220ul
,
((
void
*
)
0
),
(
System_Indicator_ON_callback
),
(
CAN_0x220_Receive
),
(
System_Indicator_OFF_callback
),
},
{
...
...
@@ -722,10 +722,6 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
},
};
void
System_Indicator_ON_callback
(
canlib_uint8_t
CopyData
[])
{
System_Indicator_CANFlag
=
0
;
}
void
System_Indicator_OFF_callback
(
canlib_uint8_t
CopyData
[])
{
System_Indicator_CANFlag
=
1
;
...
...
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h
View file @
78ead314
...
...
@@ -291,7 +291,6 @@ extern uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
extern
uint8_t
System_Indicator_CANFlag
;
void
System_Indicator_ON_callback
(
canlib_uint8_t
CopyData
[]);
void
System_Indicator_OFF_callback
(
canlib_uint8_t
CopyData
[]);
#endif
...
...
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
78ead314
...
...
@@ -383,3 +383,29 @@ void CAN_0x38E_Receive(uint8_t CopyData [])
#endif
}
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
))
{
if
(
g_GrassSwCount
<
3U
)
{
g_GrassSwCount
++
;
}
}
else
if
((
Get_CAN_CH0_ID_220_Sig_VCU_GrassSwSts
()
==
0U
)
&&
(
g_GrassSwStatus
==
1U
))
{
if
(
g_GrassSwCount
<
3U
)
{
g_GrassSwCount
++
;
}
}
else
{
g_GrassSwCount
=
0U
;
}
#endif
}
Firmware/Source/Application/CAN_User/Can_RX_User.h
View file @
78ead314
...
...
@@ -41,5 +41,6 @@ extern void CAN_0x18E_Receive(uint8_t CopyData []);
extern
void
CAN_0x225_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x234_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x38E_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x220_Receive
(
uint8_t
CopyData
[]);
#endif
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
78ead314
...
...
@@ -70,6 +70,9 @@ uint8_t g_VoltLowStatus = 0U;
uint8_t
g_VoltLowCount
=
0U
;
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
;
const
LED_Attribute_st
LED_Attribute
[
LED_Max
]
=
{
/* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */
...
...
@@ -118,6 +121,8 @@ void Telltales_Init(void)
g_EngineOilLowStatus
=
0U
;
g_VoltLowStatus
=
0U
;
g_VoltLowCount
=
0U
;
g_GrassSwStatus
=
0U
;
g_GrassSwCount
=
0U
;
Telltales_KL30_Wakeup_Init
(
Tel_Mem
,
LED_Attribute
,
&
m_ExtPara
);
}
...
...
@@ -270,14 +275,28 @@ static void LED_Oil_Pressure_Execution(Tellib_uint16_t led_status)
static
Tellib_uint16_t
LED_Grass_Full_Judgement
(
void
)
{
Tellib_uint16_t
LED_STATE
=
0u
;
if
(
Line_In_Get_Status
(
LINE_IN_GrassFull
)
&&
openLED_flag
)
{
LED_STATE
=
1
;
}
else
{
LED_STATE
=
0
;
}
#if (PART_NUMBER == RMR42E_60)
if
(
Line_In_Get_Status
(
LINE_IN_GrassFull
)
&&
openLED_flag
)
{
LED_STATE
=
1
;
}
else
{
LED_STATE
=
0
;
}
#else
if
((
g_GrassSwStatus
==
0U
)
&&
(
g_GrassSwCount
>=
3U
))
{
g_GrassSwStatus
=
1U
;
}
else
if
((
g_GrassSwStatus
==
1U
)
&&
(
g_GrassSwCount
>=
3U
))
{
g_GrassSwStatus
=
0U
;
}
LED_STATE
=
(
Tellib_uint16_t
)
g_GrassSwStatus
;
#endif
return
LED_STATE
;
}
static
void
LED_Grass_Full_Execution
(
Tellib_uint16_t
led_status
)
...
...
Firmware/Source/Component/Telltales/Telltales_user.h
View file @
78ead314
...
...
@@ -51,6 +51,8 @@ extern uint8_t g_VoltLowStatus;
extern
uint8_t
g_VoltLowCount
;
extern
uint8_t
g_OverLoadStatus
[
9
];
extern
uint8_t
g_OverLoadCount
[
9
];
extern
uint8_t
g_GrassSwStatus
;
extern
uint8_t
g_GrassSwCount
;
// 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