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
1ea77137
Commit
1ea77137
authored
Mar 04, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:修改混动车型,电量信号报文掉线后,电量条、总电量值、电量标志显示效果
parent
fa2b2673
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
20 deletions
+18
-20
CAN_CH0_CAN_Communication_Matrix.c
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+1
-1
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+5
-0
Can_RX_User.h
Firmware/Source/Application/CAN_User/Can_RX_User.h
+1
-0
Data_Soc.c
Firmware/Source/Application/Data_Soc/Data_Soc.c
+9
-18
Data_Soc.h
Firmware/Source/Application/Data_Soc/Data_Soc.h
+1
-0
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+1
-1
No files found.
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @
1ea77137
...
...
@@ -606,7 +606,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
500ul
,
0x17Aul
,
((
void
*
)
0
),
(
(
void
*
)
0
),
(
CAN_0x17A_Receive
),
((
void
*
)
0
),
},
{
...
...
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
1ea77137
...
...
@@ -667,3 +667,8 @@ void CAN_0x339_Receive(uint8_t CopyData [])
{
g_u8ID339flag
=
1U
;
}
void
CAN_0x17A_Receive
(
uint8_t
CopyData
[])
{
g_Msg0x17AFlag
=
1U
;
}
Firmware/Source/Application/CAN_User/Can_RX_User.h
View file @
1ea77137
...
...
@@ -46,5 +46,6 @@ extern void CAN_0x16B_Receive(uint8_t CopyData []);
extern
void
CAN_0x22F_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x170_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x339_Receive
(
uint8_t
CopyData
[]);
extern
void
CAN_0x17A_Receive
(
uint8_t
CopyData
[]);
#endif
Firmware/Source/Application/Data_Soc/Data_Soc.c
View file @
1ea77137
...
...
@@ -4,6 +4,7 @@
SocStruct_st_t
Soc
;
uint8_t
SOC_Count_Time
=
0
;
uint8_t
g_Msg0x17AFlag
=
0U
;
uint16_t
SocPoweroffTime
=
0
;
static
void
Data_Soc_Battery_Level_Service
(
void
);
...
...
@@ -26,6 +27,7 @@ void Data_Soc_KL30_Init(void)
Soc
.
AllSocValue
=
0U
;
Soc
.
AllSocValid
=
0U
;
SocPoweroffTime
=
0U
;
g_Msg0x17AFlag
=
0U
;
}
void
Data_Soc_KL15_Init
(
void
)
...
...
@@ -117,16 +119,11 @@ static void Data_Soc_Battery_Level_Service(void)
if
(
Get_CAN_Power_State
()
>
KEY_OFF
)
{
if
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x17A_Msg
))
==
CAN_SIG_NORMAL
)
if
(
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x17A_Msg
))
==
CAN_SIG_NORMAL
)
&&
(
g_Msg0x17AFlag
==
1U
)
)
{
Soc
.
Value1
=
Get_CAN_CH0_ID_17A_Sig_MBMS_StatSoc
();
Soc
.
Valid1
=
1U
;
}
else
{
Soc
.
Value1
=
0U
;
Soc
.
Valid1
=
0U
;
}
if
(
Soc
.
Valid1
!=
0U
)
{
...
...
@@ -376,7 +373,6 @@ static void Data_Soc_DisplayEffect_Service(void)
}
else
{
Soc
.
Valid1
=
1U
;
SocPoweroffTime
++
;
}
}
...
...
@@ -384,17 +380,12 @@ static void Data_Soc_DisplayEffect_Service(void)
{
Soc
.
Valid1
=
0U
;
}
else
{
Soc
.
Valid1
=
1U
;
}
}
else
{
if
(
Get_CAN_Power_State
()
==
KEY_ACC
)
{
Soc
.
Dis_Seg1
=
Soc
.
Act_Seg1
;
Soc
.
Valid1
=
1U
;
}
else
{
...
...
@@ -512,19 +503,20 @@ static void Data_Soc_All_Soc_Service(void)
Soc
.
AllSocValid
=
0U
;
}
#else
uint8_t
MBMSStatSoc
=
Get_CAN_CH0_ID_17A_Sig_MBMS_StatSoc
();
uint8_t
VCUChgMode
=
Get_CAN_CH0_ID_220_Sig_VCU_ChgMode
();
if
(
MBMSStatSoc
>
100U
)
if
(
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x17A_Msg
))
==
CAN_SIG_NORMAL
)
&&
(
g_Msg0x17AFlag
==
1U
)
)
{
MBMSStatSoc
=
100u
;
Soc
.
AllSocValue
=
Get_CAN_CH0_ID_17A_Sig_MBMS_StatSoc
();
if
(
Soc
.
AllSocValue
>
100U
)
{
Soc
.
AllSocValue
=
100u
;
}
}
if
(
VCUChgMode
==
1U
)
{
if
(
Get_CAN_Power_State
()
>
KEY_OFF
)
{
Soc
.
AllSocValue
=
MBMSStatSoc
;
Soc
.
AllSocValid
=
1U
;
}
else
...
...
@@ -542,7 +534,6 @@ static void Data_Soc_All_Soc_Service(void)
}
else
{
Soc
.
AllSocValue
=
MBMSStatSoc
;
Soc
.
AllSocValid
=
1U
;
}
}
...
...
Firmware/Source/Application/Data_Soc/Data_Soc.h
View file @
1ea77137
...
...
@@ -35,6 +35,7 @@ typedef struct //__attribute__((aligned(4)))
}
SocStruct_st_t
;
extern
uint8_t
g_Msg0x17AFlag
;
extern
void
Data_Soc_KL30_Init
(
void
);
extern
void
Data_Soc_KL15_Init
(
void
);
...
...
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
1ea77137
...
...
@@ -663,7 +663,7 @@ _Fun_Res SEG_SET_EleDial_1SOC(uint8_t m_Flag, uint8_t m_SEG)
#if (PART_NUMBER == RMR42E_60)
if
(((
m_Flag
==
1u
)
&&
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x18200A20_Msg
))
==
CAN_SIG_NORMAL
))
||
(
checkself_seg_Flag
==
1
))
#else
if
((
(
m_Flag
==
1u
)
&&
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x17A_Msg
))
==
CAN_SIG_NORMAL
)
)
||
(
checkself_seg_Flag
==
1
))
if
((
m_Flag
==
1u
)
||
(
checkself_seg_Flag
==
1
))
#endif
{
IC1_SEG136
=
IC_SEG_GREY
;
...
...
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