Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
TianYing_ty100
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
TY
TianYing_ty100
Commits
5d5b9970
Commit
5d5b9970
authored
Sep 10, 2024
by
李俭双
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:代码评审问题:删除无用代码,统一IGOFF下的显示逻辑
parent
019a21ee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
41 deletions
+74
-41
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+69
-1
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+5
-40
No files found.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
5d5b9970
...
...
@@ -64,6 +64,74 @@ void Clear_Bu98(void)
uint8_t
u8VspeedCount
=
0
;
void
Gauge_Service
(
void
)
{
static
uint16_t
VSpeed_Count
=
0u
;
uint8_t
k
=
0
;
if
(
SYS_OPR_STAT_IGN_ON
)
{
if
(
ClearODO_Flag
==
1
)
{
Check_SEG_Display
();
for
(
k
=
0
;
k
<
LampCh0_MAX
;
k
++
)
{
if
(
k
==
24
||
k
==
21
||
k
==
13
||
k
==
26
)
{
;
}
else
{
LED_Driver_Channel_Set
(
LampChannel_0
,
k
,
LED_ON
);
}
}
}
else
{
if
(
Common_GetIgnOnTime
()
>=
3030
)
{
if
(
u8VspeedCount
<
3
)
{
u8VspeedCount
++
;
}
else
{
u8VspeedCount
=
0
;
SEG_SET_VSpeed_NUM
(
1u
,
Get_DispVechileSpeed
(
)
/
10u
,
Get_Dis_KM_Unit
());
}
SEG_SET_ODO_TRIP_FAULTCODE_TCS_DIS
(
Get_Dis_KM_Unit
(),
Get_ODO_Value
()
/
10u
,
Get_Trip_Value
());
Gauge_Clock_Display
();
SEG_SET_FuelDial
(
1
,
Get_CurFuelSetp
());
SEG_SET_EspeedDial
(
1
,
Get_DispEngineSpeed
()
/
500
);
SEG_SET_CoolantDial
(
1
,
GET_DataCoolantTempSegDisp
(),
GET_DataCoolantSegValue
(),
GET_DataCollantTempSegValid
());
SEG_SET_Voltage_NUM
(
1
,
Get_Battery_Voltage
());
#if(IC_Current == TY200_080000b_ty)
SEG_SET_TPMS_DISPLAY
(
1
,
Get_Front_TPMS_Sig_Value
(),
Get_Rear_TPMS_Sig_Value
(),
0
,
Get_Front_TPMS_Sig_Vaild
(),
Get_Rear_TPMS_Sig_Vaild
());
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_03
,
LED_ON
);
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_04
,
LED_ON
);
#endif
SEG_SET_Navigation_STS
(
Get_Navigation_St_Dis
(),
Get_Navigation_Code_Dis
(),
Get_Navigation_Mileage_Dis
());
}
else
{
Checkself_SEG_Display
();
}
}
}
else
{
Clear_Bu98
();
for
(
k
=
0
;
k
<
LampCh0_MAX
;
k
++
)
{
LED_Driver_Channel_Set
(
LampChannel_0
,
k
,
LED_OFF
);
}
}
}
#if 0
void Gauge_Service(void)
{
static uint16_t VSpeed_Count = 0u;
uint8_t k = 0;
...
...
@@ -163,4 +231,4 @@ void Gauge_Service(void)
}
}
#endif
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
5d5b9970
...
...
@@ -4524,9 +4524,7 @@ void Checkself_Init(void)
Espeed_check_SEG_step
=
0
;
fuel_check_SEG_step
=
0
;
}
//uint32_t u32NavigationCount = 0;
//uint32_t u32NavigationCount00 = 0;
//uint32_t u32NavigationCount11 = 1;
void
Checkself_SEG_Display
(
void
)
{
uint16_t
Vspeed
=
0
;
...
...
@@ -4539,41 +4537,7 @@ void Checkself_SEG_Display(void)
uint8_t
min
=
0
;
uint32_t
ODO
=
0
;
uint32_t
Mileage
=
0
;
// uint32_t i = 0;
//SEG_SET_Navigation_Checkself(u32YZHDCount * 1111,u32YZHDCount22);
//u32NavigationCount00++;
//if (u32NavigationCount00 >= 3) // 500ms
//{
// u32NavigationCount00 = 0;
// if (u32NavigationCount11 == 1)
// {
// u32NavigationCount++;
// if (u32NavigationCount >= 9)
// {
// u32NavigationCount11 = 0;
// }
// }
// else
// {
// if (u32NavigationCount)
// {
// u32NavigationCount--;
// }
// else
// {
// u32NavigationCount11 = 1;
// //u32YZHDCount22 = 0;
// }
// }
//}
// for(i = 0; i < BU98R10_DDRAM_SIZE; i ++)
//{
// BU98R10Chip0DDRAM.Byte[i] = 1;
// BU98R10Chip1DDRAM.Byte[i] = 1;
// }
#if (1)
if
(
Common_GetIgnOnTime
()
>=
30
)
{
if
(
Checkself_SEG_step_count
<
60
)
...
...
@@ -4625,10 +4589,11 @@ void Checkself_SEG_Display(void)
#if (IC_Current == TY200_080000b_ty)
TPMS_dis
=
(
Checkself_SEG_step
/
3
)
*
11
;
SEG_SET_TPMS_DISPLAY
(
1
,
TPMS_dis
,
TPMS_dis
,
0
,
1
,
1
);
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_03
,
LED_ON
);
LED_Driver_Channel_Set
(
LampChannel_0
,
LampCh0_04
,
LED_ON
);
#endif
#endif
}
void
TYW_Check_Count
(
void
)
...
...
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