Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
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
时昊
haoJin750TFT
Commits
6ce2e61e
Commit
6ce2e61e
authored
Aug 30, 2024
by
王雅楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修复燃油自检
parent
d0efedc8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
21 deletions
+30
-21
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+30
-21
No files found.
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
6ce2e61e
...
@@ -11,8 +11,9 @@ uint8_t g_u8UnitSetting = Metric ;
...
@@ -11,8 +11,9 @@ uint8_t g_u8UnitSetting = Metric ;
uint8_t
g_u8SelfCheck
=
0
;
/*自检*/
uint8_t
g_u8SelfCheck
=
0
;
/*自检*/
uint16_t
g_u16fuelnumberup
=
0
;
uint16_t
g_u16fuelnumberup
=
0
;
uint16_t
g_u16fuelnumberdown
=
320
;
uint16_t
g_u16vspeednumberup
=
0
;
uint16_t
g_u16vspeednumberup
=
0
;
uint16_t
g_u16vspeednumberdown
=
3
00
;
uint16_t
g_u16vspeednumberdown
=
2
00
;
uint16_t
g_u16espeednumberup
=
0
;
uint16_t
g_u16espeednumberup
=
0
;
uint16_t
g_u16espeednumberdown
=
300
;
uint16_t
g_u16espeednumberdown
=
300
;
uint16_t
g_u16voltagenumberup
=
0
;
uint16_t
g_u16voltagenumberup
=
0
;
...
@@ -2793,7 +2794,7 @@ static const uint16_t PICList_Fuel[] = {
...
@@ -2793,7 +2794,7 @@ static const uint16_t PICList_Fuel[] = {
// Pic_0561_623_473,
// Pic_0561_623_473,
// };
// };
static
const
uint16_t
PICList_Fuel_SelfCheck
[]
=
{
static
const
uint16_t
PICList_Fuel_SelfCheck
[]
=
{
Pic_0554_315_473
,
Pic_0554_315_473
,
/*黑*/
Pic_0555_366_473
,
Pic_0555_366_473
,
Pic_0556_426_473
,
Pic_0556_426_473
,
Pic_0557_469_473
,
Pic_0557_469_473
,
...
@@ -3133,7 +3134,7 @@ static void AMT630H_GUI_Fuel_SelfCheck(uint8_t Fuel)
...
@@ -3133,7 +3134,7 @@ static void AMT630H_GUI_Fuel_SelfCheck(uint8_t Fuel)
}
}
else
if
((
FuelLevel
<
g_u16_GUI_PerFuelLevel
)
&&
(
g_u16_GUI_PerFuelLevel
!=
0
))
else
if
((
FuelLevel
<
g_u16_GUI_PerFuelLevel
)
&&
(
g_u16_GUI_PerFuelLevel
!=
0
))
{
{
g_u16_GUI_PerFuelLevel
--
;
g_u16_GUI_PerFuelLevel
--
;
/*fuellevel = 8 */
}
}
else
else
{
{
...
@@ -4010,26 +4011,34 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
...
@@ -4010,26 +4011,34 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
AMT630H_GUI_Trip
(
Get_Trip_Value
(),
Get_Dis_Unit
());
AMT630H_GUI_Trip
(
Get_Trip_Value
(),
Get_Dis_Unit
());
}
}
/*燃油自检*/
/*燃油自检*/
if
(
g_u16fuelnumberup
<
60
0
)
if
(
g_u16fuelnumberup
<
32
0
)
{
{
g_u16fuelnumberup
+=
12
;
AMT630H_GUI_Fuel_SelfCheck
(
g_u16fuelnumberup
/
40
);
AMT630H_GUI_Fuel_SelfCheck
(
g_u16fuelnumberup
/
75
);
/*初始化g_u16fuelnumberup = 0*/
g_u16fuelnumberup
+=
8
;
}
else
{
if
(
g_u16fuelnumberdown
>
0
)
{
g_u16fuelnumberdown
-=
8
;
AMT630H_GUI_Fuel_SelfCheck
(
g_u16fuelnumberdown
/
40
);
/*初始化g_u16fuelnumberdown = 320*/
}
}
else
else
{
{
;
;
}
}
}
/*车速自检*/
/*车速自检*/
if
(
g_u16vspeednumberup
<
3
00
)
if
(
g_u16vspeednumberup
<
=
2
00
)
{
{
AMT630H_GUI_VSpeed
(
g_u16vspeednumberup
,
Get_Dis_Unit
());
/*初始化g_u16vspeednumberup = 0*/
AMT630H_GUI_VSpeed
(
g_u16vspeednumberup
,
Get_Dis_Unit
());
/*初始化g_u16vspeednumberup = 0*/
g_u16vspeednumberup
+=
12
;
g_u16vspeednumberup
+=
8
;
}
}
else
else
{
{
if
(
g_u16vspeednumberdown
>
0
)
if
(
g_u16vspeednumberdown
>
0
)
{
{
g_u16vspeednumberdown
-=
12
;
/*初始化g_u16vspeednumberup=6
00*/
g_u16vspeednumberdown
-=
8
;
/*初始化g_u16vspeednumberup=2
00*/
AMT630H_GUI_VSpeed
(
g_u16vspeednumberdown
,
Get_Dis_Unit
());
/*if g_u16vspeednumberup=0 车速自检结束*/
AMT630H_GUI_VSpeed
(
g_u16vspeednumberdown
,
Get_Dis_Unit
());
/*if g_u16vspeednumberup=0 车速自检结束*/
}
}
else
else
...
@@ -4087,10 +4096,10 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
...
@@ -4087,10 +4096,10 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
}
}
if
(
g_u16voltagenumberdown
==
0
)
if
(
g_u16voltagenumberdown
==
0
)
{
{
AMT630H_GUI_Voltage
(
g_u16voltagenumberdown
);
AMT630H_GUI_Voltage
(
0
);
}
}
/*结束自检*/
/*结束自检*/
if
((
g_u16fuelnumber
up
==
60
0
)
&&
(
g_u16vspeednumberdown
==
0
)
&&
(
g_u16espeednumberdown
==
0
)
&&
(
g_u16voltagenumberdown
==
0
))
if
((
g_u16fuelnumber
down
==
0
)
&&
(
g_u16vspeednumberdown
==
0
)
&&
(
g_u16espeednumberdown
==
0
)
&&
(
g_u16voltagenumberdown
==
0
))
{
{
g_u8SelfCheck
=
1
;
/*自检结束标志*/
g_u8SelfCheck
=
1
;
/*自检结束标志*/
}
}
...
@@ -4103,13 +4112,13 @@ void AMT630H_GUI_SELFCHECK_STS_INIT(void)
...
@@ -4103,13 +4112,13 @@ void AMT630H_GUI_SELFCHECK_STS_INIT(void)
{
{
g_u8SelfCheck
=
0U
;
g_u8SelfCheck
=
0U
;
g_u16fuelnumberup
=
0U
;
g_u16fuelnumberup
=
0U
;
g_u16fuelnumberdown
=
320U
;
g_u16vspeednumberup
=
0U
;
g_u16vspeednumberup
=
0U
;
g_u16espeednumberup
=
0U
;
g_u16espeednumberup
=
0U
;
g_u16vspeednumberdown
=
3
00U
;
g_u16vspeednumberdown
=
2
00U
;
g_u16espeednumberdown
=
300U
;
g_u16espeednumberdown
=
300U
;
g_u16voltagenumberup
=
0
;
g_u16voltagenumberup
=
0U
;
g_u16voltagenumberdown
=
160
;
g_u16voltagenumberdown
=
160U
;
}
}
...
...
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