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
4dc403ba
Commit
4dc403ba
authored
Jul 31, 2024
by
李俭双
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'CHENJIALE' into 'dev'
Chenjiale See merge request
!59
parents
dc9948d0
06eb2b04
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
7 deletions
+10
-7
Data_Fuel.c
Firmware/Source/Application/Fuel/Data_Fuel.c
+8
-5
UDS_ISO14229_Services.h
Firmware/Source/UDS/UDS_ISO14229_Services.h
+2
-2
软件变更记录(天鹰项目139).xlsx
Firmware/utility/程序释放/软件变更记录(天鹰项目139).xlsx
+0
-0
No files found.
Firmware/Source/Application/Fuel/Data_Fuel.c
View file @
4dc403ba
...
@@ -35,7 +35,7 @@ void Fuel_KL30_Init(void)
...
@@ -35,7 +35,7 @@ void Fuel_KL30_Init(void)
FuelInitFlag
=
1u
;
FuelInitFlag
=
1u
;
FuelStateInitFlag
=
1u
;
FuelStateInitFlag
=
1u
;
FuelDir
=
FUEL_SEG_UP
;
FuelDir
=
FUEL_SEG_UP
;
FuelSensorState
=
FuelSensorShortCircuit
;
//FuelSensorNormal;
FuelSensorState
=
FuelSensor
Normal
;
//FuelSensor
ShortCircuit;//FuelSensorNormal;
FuelSensorNormalTime
=
0u
;
FuelSensorNormalTime
=
0u
;
FuelSensorShortTime
=
0u
;
FuelSensorShortTime
=
0u
;
FuelSensorOpenTime
=
0u
;
FuelSensorOpenTime
=
0u
;
...
@@ -51,7 +51,7 @@ void Fuel_KL15_Init(void)
...
@@ -51,7 +51,7 @@ void Fuel_KL15_Init(void)
FuelInitFlag
=
1u
;
FuelInitFlag
=
1u
;
FuelStateInitFlag
=
1u
;
FuelStateInitFlag
=
1u
;
FuelDir
=
FUEL_SEG_UP
;
FuelDir
=
FUEL_SEG_UP
;
FuelSensorState
=
FuelSensorShortCircuit
;
//FuelSensorNormal;
FuelSensorState
=
FuelSensor
Normal
;
//FuelSensor
ShortCircuit;//FuelSensorNormal;
FuelSensorNormalTime
=
0u
;
FuelSensorNormalTime
=
0u
;
FuelSensorShortTime
=
0u
;
FuelSensorShortTime
=
0u
;
FuelSensorOpenTime
=
0u
;
FuelSensorOpenTime
=
0u
;
...
@@ -130,7 +130,7 @@ void Fuel_State_Check(uint8_t deltaTime)
...
@@ -130,7 +130,7 @@ void Fuel_State_Check(uint8_t deltaTime)
{
/*短路 1*/
{
/*短路 1*/
FuelSensorOpenTime
=
0
;
FuelSensorOpenTime
=
0
;
FuelSensorNormalTime
=
0
;
FuelSensorNormalTime
=
0
;
if
((
FuelSensorShortTime
>
3000
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorShortTime
>
3000
)))
if
((
FuelSensorShortTime
>
3000
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorShortTime
<=
3000
)))
{
{
FuelSensorState
=
FuelSensorShortCircuit
;
FuelSensorState
=
FuelSensorShortCircuit
;
DesFuelSetp
=
0
;
DesFuelSetp
=
0
;
...
@@ -148,7 +148,7 @@ void Fuel_State_Check(uint8_t deltaTime)
...
@@ -148,7 +148,7 @@ void Fuel_State_Check(uint8_t deltaTime)
{
/*断路 320*/
{
/*断路 320*/
FuelSensorShortTime
=
0
;
FuelSensorShortTime
=
0
;
FuelSensorNormalTime
=
0
;
FuelSensorNormalTime
=
0
;
if
((
FuelSensorOpenTime
>
2800
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorOpenTime
>
2800
)))
if
((
FuelSensorOpenTime
>
2800
)
||
((
FuelStateInitFlag
)
&&
(
FuelSensorOpenTime
<=
2800
)))
{
{
FuelSensorState
=
FuelSensorOpenCircuit
;
FuelSensorState
=
FuelSensorOpenCircuit
;
DesFuelSetp
=
0
;
DesFuelSetp
=
0
;
...
@@ -221,7 +221,7 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
...
@@ -221,7 +221,7 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
}
}
}
}
/*计算目标格数*/
if
(
FuelDir
==
FUEL_SEG_UP
)
if
(
FuelDir
==
FUEL_SEG_UP
)
{
{
if
(((
DesFuelSetp
==
4
)
||
FuelInitFlag
)
&&
(
FuelR
<
130
))
if
(((
DesFuelSetp
==
4
)
||
FuelInitFlag
)
&&
(
FuelR
<
130
))
...
@@ -268,6 +268,9 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
...
@@ -268,6 +268,9 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
DesFuelSetp
=
4
;
DesFuelSetp
=
4
;
}
}
}
}
}
}
/*IGN ON 1秒/故障恢复后,开始走格 立即指向当前格 20220704*/
/*IGN ON 1秒/故障恢复后,开始走格 立即指向当前格 20220704*/
...
...
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @
4dc403ba
...
@@ -314,10 +314,10 @@
...
@@ -314,10 +314,10 @@
#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x101 // 0x100 = 1.00 hardware version 硬件版本号
#define HWV 0x101 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x1
09
// 0x100 = 1.00 internal version 内部版本号
#define INTLV 0x1
10
// 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_M 0x07 // 0x03 = 3月, program month
#define PROG_M 0x07 // 0x03 = 3月, program month
#define PROG_D 0x
24
// 0x19 = 19日, program day
#define PROG_D 0x
31
// 0x19 = 19日, program day
/******************************************************************************
/******************************************************************************
Bootloader Variable
Bootloader Variable
...
...
Firmware/utility/程序释放/软件变更记录(天鹰项目139).xlsx
View file @
4dc403ba
No preview for this file type
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