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
4a797822
Commit
4a797822
authored
Jul 31, 2024
by
陈家乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:更改燃油状态初始化值,燃油状态检测判断条件
parent
f8ad87c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
49 additions
and
44 deletions
+49
-44
Data_Fuel.c
Firmware/Source/Application/Fuel/Data_Fuel.c
+49
-44
No files found.
Firmware/Source/Application/Fuel/Data_Fuel.c
View file @
4a797822
...
...
@@ -35,7 +35,7 @@ void Fuel_KL30_Init(void)
FuelInitFlag
=
1u
;
FuelStateInitFlag
=
1u
;
FuelDir
=
FUEL_SEG_UP
;
FuelSensorState
=
FuelSensorShortCircuit
;
//FuelSensorNormal;
FuelSensorState
=
FuelSensor
Normal
;
//FuelSensor
ShortCircuit;//FuelSensorNormal;
FuelSensorNormalTime
=
0u
;
FuelSensorShortTime
=
0u
;
FuelSensorOpenTime
=
0u
;
...
...
@@ -51,7 +51,7 @@ void Fuel_KL15_Init(void)
FuelInitFlag
=
1u
;
FuelStateInitFlag
=
1u
;
FuelDir
=
FUEL_SEG_UP
;
FuelSensorState
=
FuelSensorShortCircuit
;
//FuelSensorNormal;
FuelSensorState
=
FuelSensor
Normal
;
//FuelSensor
ShortCircuit;//FuelSensorNormal;
FuelSensorNormalTime
=
0u
;
FuelSensorShortTime
=
0u
;
FuelSensorOpenTime
=
0u
;
...
...
@@ -130,7 +130,7 @@ void Fuel_State_Check(uint8_t deltaTime)
{
/*短路 1*/
FuelSensorOpenTime
=
0
;
FuelSensorNormalTime
=
0
;
if
((
FuelSensorShortTime
>
3000
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorShortTime
>
3000
)))
if
((
FuelSensorShortTime
>
3000
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorShortTime
<=
3000
)))
{
FuelSensorState
=
FuelSensorShortCircuit
;
DesFuelSetp
=
0
;
...
...
@@ -148,7 +148,7 @@ void Fuel_State_Check(uint8_t deltaTime)
{
/*断路 320*/
FuelSensorShortTime
=
0
;
FuelSensorNormalTime
=
0
;
if
((
FuelSensorOpenTime
>
2800
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorOpenTime
>
2800
)))
if
((
FuelSensorOpenTime
>
2800
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorOpenTime
<=
2800
)))
{
FuelSensorState
=
FuelSensorOpenCircuit
;
DesFuelSetp
=
0
;
...
...
@@ -222,52 +222,57 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
}
/*计算目标格数*/
if
(
FuelDir
==
FUEL_SEG_UP
)
if
(
Common_GetIgnOnTime
()
>
3005
)
{
if
(((
DesFuelSetp
==
4
)
||
FuelInitFlag
)
&&
(
FuelR
<
130
))
{
DesFuelSetp
=
5
;
}
else
if
(((
DesFuelSetp
==
3
)
||
FuelInitFlag
)
&&
(
FuelR
<
280
))
if
(
FuelDir
==
FUEL_SEG_UP
)
{
DesFuelSetp
=
4
;
}
else
if
(((
DesFuelSetp
==
2
)
||
FuelInitFlag
)
&&
(
FuelR
<
430
))
{
DesFuelSetp
=
3
;
}
else
if
(((
DesFuelSetp
==
1
)
||
FuelInitFlag
)
&&
(
FuelR
<
710
))
{
DesFuelSetp
=
2
;
}
else
if
(((
DesFuelSetp
==
0
)
||
FuelInitFlag
)
&&
(
FuelR
<
910
))
{
DesFuelSetp
=
1
;
}
}
else
if
(
FuelDir
==
FUEL_SEG_DOWN
)
{
if
(((
DesFuelSetp
==
1
)
||
FuelInitFlag
)
&&
(
FuelR
>=
910
))
{
DesFuelSetp
=
0
;
}
else
if
(((
DesFuelSetp
==
2
)
||
FuelInitFlag
)
&&
(
FuelR
>=
710
))
{
DesFuelSetp
=
1
;
}
else
if
(((
DesFuelSetp
==
3
)
||
FuelInitFlag
)
&&
(
FuelR
>=
430
))
{
DesFuelSetp
=
2
;
}
else
if
(((
DesFuelSetp
==
4
)
||
FuelInitFlag
)
&&
(
FuelR
>=
280
))
{
DesFuelSetp
=
3
;
if
(((
DesFuelSetp
==
4
)
||
FuelInitFlag
)
&&
(
FuelR
<
130
))
{
DesFuelSetp
=
5
;
}
else
if
(((
DesFuelSetp
==
3
)
||
FuelInitFlag
)
&&
(
FuelR
<
280
))
{
DesFuelSetp
=
4
;
}
else
if
(((
DesFuelSetp
==
2
)
||
FuelInitFlag
)
&&
(
FuelR
<
430
))
{
DesFuelSetp
=
3
;
}
else
if
(((
DesFuelSetp
==
1
)
||
FuelInitFlag
)
&&
(
FuelR
<
710
))
{
DesFuelSetp
=
2
;
}
else
if
(((
DesFuelSetp
==
0
)
||
FuelInitFlag
)
&&
(
FuelR
<
910
))
{
DesFuelSetp
=
1
;
}
}
else
if
(
((
DesFuelSetp
==
5
)
||
FuelInitFlag
)
&&
(
FuelR
>=
130
)
)
else
if
(
FuelDir
==
FUEL_SEG_DOWN
)
{
DesFuelSetp
=
4
;
if
(((
DesFuelSetp
==
1
)
||
FuelInitFlag
)
&&
(
FuelR
>=
910
))
{
DesFuelSetp
=
0
;
}
else
if
(((
DesFuelSetp
==
2
)
||
FuelInitFlag
)
&&
(
FuelR
>=
710
))
{
DesFuelSetp
=
1
;
}
else
if
(((
DesFuelSetp
==
3
)
||
FuelInitFlag
)
&&
(
FuelR
>=
430
))
{
DesFuelSetp
=
2
;
}
else
if
(((
DesFuelSetp
==
4
)
||
FuelInitFlag
)
&&
(
FuelR
>=
280
))
{
DesFuelSetp
=
3
;
}
else
if
(((
DesFuelSetp
==
5
)
||
FuelInitFlag
)
&&
(
FuelR
>=
130
))
{
DesFuelSetp
=
4
;
}
}
}
}
/*IGN ON 1秒/故障恢复后,开始走格 立即指向当前格 20220704*/
...
...
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