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
33e78888
Commit
33e78888
authored
Mar 05, 2025
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:优化ACC OFF下段码的显示功能
parent
f70e40eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
92 additions
and
14 deletions
+92
-14
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+85
-14
GUI_Display.h
Firmware/Source/Application/GUI_Display/GUI_Display.h
+7
-0
No files found.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
33e78888
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
uint8_t
Charge_OFF_Flag
=
0
;
uint8_t
Charge_OFF_Flag
=
0
;
void
Clear_Bu98_Conditions
(
DoNot_Close_Seg_en_t
closeType
);
void
TYW_Clear_Eeprom_Service
(
void
)
void
TYW_Clear_Eeprom_Service
(
void
)
{
{
#if (PART_NUMBER == RMR42E_60)
#if (PART_NUMBER == RMR42E_60)
...
@@ -162,20 +164,88 @@ void Clear_Bu98(void)
...
@@ -162,20 +164,88 @@ void Clear_Bu98(void)
}
}
}
}
void
Clear_Bu98_Conditions
(
void
)
void
Clear_Bu98_Conditions
(
DoNot_Close_Seg_en_t
closeType
)
{
{
uint8_t
i
=
0
;
uint8_t
i
=
0
;
for
(
i
=
0
;
i
<
BU98R10_DDRAM_SIZE
;
i
++
)
uint8_t
transitionData
=
0U
;
if
(
closeType
==
ONLY_TEL
)
{
{
BU98R10Chip0DDRAM
.
Byte
[
i
]
=
0
;
for
(
i
=
0
;
i
<
BU98R10_DDRAM_SIZE
;
i
++
)
BU98R10Chip1DDRAM
.
Byte
[
i
]
=
0
;
{
if
(
i
==
74U
)
{
transitionData
=
((
BU98R10Chip0DDRAM
.
Byte
[
75
]
>>
4U
)
&
0xFU
);
BU98R10Chip0DDRAM
.
Byte
[
75
]
=
((
transitionData
<<
4U
)
+
0
);
transitionData
=
0
;
}
else
{
BU98R10Chip0DDRAM
.
Byte
[
i
]
=
0
;
}
if
(
i
==
46U
)
{
transitionData
=
((
BU98R10Chip1DDRAM
.
Byte
[
46
])
&
0xFU
);
BU98R10Chip1DDRAM
.
Byte
[
46
]
=
transitionData
;
transitionData
=
0
;
}
else
{
BU98R10Chip1DDRAM
.
Byte
[
i
]
=
0
;
}
}
}
else
if
(
closeType
==
TEL_AND_SOC
)
{
for
(
i
=
0
;
i
<
BU98R10_DDRAM_SIZE
;
i
++
)
{
if
((
i
==
26
)
||
(
i
==
28
)
||
(
i
==
74U
))
{
transitionData
=
((
BU98R10Chip0DDRAM
.
Byte
[
i
]
>>
4U
)
&
0xFU
);
BU98R10Chip0DDRAM
.
Byte
[
i
]
=
((
transitionData
<<
4U
)
+
0
);
transitionData
=
0
;
}
else
if
((
i
==
29U
)
||
(
i
==
30U
)
||
(
i
==
31U
)
||
(
i
==
32U
)
||
(
i
==
33U
)
||
(
i
==
34U
)
||
(
i
==
35U
)
||
(
i
==
60U
)
||
(
i
==
67U
)
||
(
i
==
68U
)
||
(
i
==
71U
)
||
(
i
==
72U
)
||
(
i
==
73U
))
{
;
}
else
{
BU98R10Chip0DDRAM
.
Byte
[
i
]
=
0
;
}
if
(
i
==
46U
)
{
transitionData
=
((
BU98R10Chip1DDRAM
.
Byte
[
46
])
&
0xFU
);
BU98R10Chip1DDRAM
.
Byte
[
46
]
=
transitionData
;
transitionData
=
0
;
}
else
{
BU98R10Chip1DDRAM
.
Byte
[
i
]
=
0
;
}
}
}
else
{
for
(
i
=
0
;
i
<
BU98R10_DDRAM_SIZE
;
i
++
)
{
BU98R10Chip0DDRAM
.
Byte
[
i
]
=
0
;
BU98R10Chip1DDRAM
.
Byte
[
i
]
=
0
;
}
}
}
}
}
void
Gauge_Service
(
void
)
void
Gauge_Service
(
void
)
{
{
uint8_t
i
=
0
;
uint8_t
i
=
0
;
#if(PART_NUMBER == G54_A01)
if
((
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
)
&&
(
Get_CAN_Power_State
()
==
KEY_ACC
))
#else
if
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
)
if
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
)
#endif
{
{
if
((
Get_CAN_Power_State
()
!=
PKEY_ON
)
&&
(
Get_CAN_Power_State
()
!=
KEY_OFF
)
&&
(
Get_CAN_Power_State
()
!=
POWER_CHECK_NULL
))
if
((
Get_CAN_Power_State
()
!=
PKEY_ON
)
&&
(
Get_CAN_Power_State
()
!=
KEY_OFF
)
&&
(
Get_CAN_Power_State
()
!=
POWER_CHECK_NULL
))
{
{
...
@@ -241,20 +311,21 @@ void Gauge_Service(void)
...
@@ -241,20 +311,21 @@ void Gauge_Service(void)
{
{
Gauge_Power_SOC_pull_Display
();
Gauge_Power_SOC_pull_Display
();
Gauge_EleDial_AllSOC_Display
();
Gauge_EleDial_AllSOC_Display
();
Clear_Bu98_Conditions
(
TEL_AND_SOC
);
}
}
else
else
{
{
// Clear_Bu98();
Clear_Bu98_Conditions
(
ONLY_TEL
);
for
(
i
=
0
;
i
<
LampCh0_MAX
;
i
++
)
}
for
(
i
=
0
;
i
<
LampCh0_MAX
;
i
++
)
{
if
((
i
==
LampCh0_08_Battery_Charging_W
)
||
(
i
==
LampCh0_32_Charging_Connection_R
))
{
{
if
((
i
==
em_LED_Battery_Charging_W
)
||
(
i
==
em_LED_Charging_Connection_R
))
;
{
}
;
else
}
{
else
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
{
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
}
}
}
}
}
#else
#else
...
...
Firmware/Source/Application/GUI_Display/GUI_Display.h
View file @
33e78888
...
@@ -5,6 +5,13 @@
...
@@ -5,6 +5,13 @@
#define EEPROM_BLOCK_00 0
#define EEPROM_BLOCK_00 0
typedef
enum
{
ONLY_TEL
,
/*只保持充电中指示灯和充电线不连接指示灯不关闭*/
TEL_AND_SOC
,
/*保持充电中指示灯和充电线不连接指示灯以及电量表和总电量值显示不关闭*/
}
DoNot_Close_Seg_en_t
;
typedef
struct
typedef
struct
{
{
uint16_t
value
;
uint16_t
value
;
...
...
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