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
4f36d69e
Commit
4f36d69e
authored
Jul 05, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:增加水温文件
parent
fa0f7a76
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
249 additions
and
233 deletions
+249
-233
HaoJin750TFT.uvoptx
...e/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvoptx
+68
-56
HaoJin750TFT.uvprojx
.../Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
+5
-0
Data_Coolant.c
Firmware/Source/Application/Data_Coolant.c
+166
-167
Data_Coolant.h
Firmware/Source/Application/Data_Coolant.h
+10
-10
No files found.
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvoptx
View file @
4f36d69e
...
...
@@ -847,7 +847,7 @@
<Group>
<GroupName>
Application
</GroupName>
<tvExp>
0
</tvExp>
<tvExp>
1
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<cbSel>
0
</cbSel>
<RteFlg>
0
</RteFlg>
...
...
@@ -995,6 +995,18 @@
<RteFlg>
0
</RteFlg>
<bShared>
0
</bShared>
</File>
<File>
<GroupNumber>
4
</GroupNumber>
<FileNumber>
59
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<bDave2>
0
</bDave2>
<PathWithFileName>
..\..\..\..\Source\Application\Data_Coolant.c
</PathWithFileName>
<FilenameWithoutPath>
Data_Coolant.c
</FilenameWithoutPath>
<RteFlg>
0
</RteFlg>
<bShared>
0
</bShared>
</File>
</Group>
<Group>
...
...
@@ -1005,7 +1017,7 @@
<RteFlg>
0
</RteFlg>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
59
</FileNumber>
<FileNumber>
60
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1017,7 +1029,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
0
</FileNumber>
<FileNumber>
6
1
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1029,7 +1041,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
1
</FileNumber>
<FileNumber>
6
2
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1041,7 +1053,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
2
</FileNumber>
<FileNumber>
6
3
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1053,7 +1065,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
3
</FileNumber>
<FileNumber>
6
4
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1065,7 +1077,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
4
</FileNumber>
<FileNumber>
6
5
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1077,7 +1089,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
5
</FileNumber>
<FileNumber>
6
6
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1089,7 +1101,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
6
</FileNumber>
<FileNumber>
6
7
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1101,7 +1113,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
7
</FileNumber>
<FileNumber>
6
8
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1113,7 +1125,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
6
8
</FileNumber>
<FileNumber>
6
9
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1125,7 +1137,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
69
</FileNumber>
<FileNumber>
70
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1137,7 +1149,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
0
</FileNumber>
<FileNumber>
7
1
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1149,7 +1161,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
1
</FileNumber>
<FileNumber>
7
2
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1161,7 +1173,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
2
</FileNumber>
<FileNumber>
7
3
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1173,7 +1185,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
3
</FileNumber>
<FileNumber>
7
4
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1185,7 +1197,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
4
</FileNumber>
<FileNumber>
7
5
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1197,7 +1209,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
5
</FileNumber>
<FileNumber>
7
6
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1209,7 +1221,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
6
</FileNumber>
<FileNumber>
7
7
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1221,7 +1233,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
7
</FileNumber>
<FileNumber>
7
8
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1233,7 +1245,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
7
8
</FileNumber>
<FileNumber>
7
9
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1245,7 +1257,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
79
</FileNumber>
<FileNumber>
80
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1257,7 +1269,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
0
</FileNumber>
<FileNumber>
8
1
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1269,7 +1281,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
1
</FileNumber>
<FileNumber>
8
2
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1281,7 +1293,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
2
</FileNumber>
<FileNumber>
8
3
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1293,7 +1305,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
3
</FileNumber>
<FileNumber>
8
4
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1305,7 +1317,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
4
</FileNumber>
<FileNumber>
8
5
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1317,7 +1329,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
5
</FileNumber>
<FileNumber>
8
6
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1329,7 +1341,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
6
</FileNumber>
<FileNumber>
8
7
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1341,7 +1353,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
7
</FileNumber>
<FileNumber>
8
8
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1353,7 +1365,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
8
8
</FileNumber>
<FileNumber>
8
9
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1365,7 +1377,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
89
</FileNumber>
<FileNumber>
90
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1377,7 +1389,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
0
</FileNumber>
<FileNumber>
9
1
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1389,7 +1401,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
1
</FileNumber>
<FileNumber>
9
2
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1401,7 +1413,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
2
</FileNumber>
<FileNumber>
9
3
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1413,7 +1425,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
3
</FileNumber>
<FileNumber>
9
4
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1425,7 +1437,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
4
</FileNumber>
<FileNumber>
9
5
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1437,7 +1449,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
5
</FileNumber>
<FileNumber>
9
6
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1449,7 +1461,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
6
</FileNumber>
<FileNumber>
9
7
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1461,7 +1473,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
7
</FileNumber>
<FileNumber>
9
8
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1473,7 +1485,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
8
</FileNumber>
<FileNumber>
9
9
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1485,7 +1497,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
99
</FileNumber>
<FileNumber>
100
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1497,7 +1509,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
0
</FileNumber>
<FileNumber>
10
1
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1509,7 +1521,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
1
</FileNumber>
<FileNumber>
10
2
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1521,7 +1533,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
2
</FileNumber>
<FileNumber>
10
3
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1533,7 +1545,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
3
</FileNumber>
<FileNumber>
10
4
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1545,7 +1557,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
4
</FileNumber>
<FileNumber>
10
5
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1557,7 +1569,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
5
</FileNumber>
<FileNumber>
10
6
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1569,7 +1581,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
6
</FileNumber>
<FileNumber>
10
7
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1581,7 +1593,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
7
</FileNumber>
<FileNumber>
10
8
</FileNumber>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1593,7 +1605,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
8
</FileNumber>
<FileNumber>
10
9
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1605,7 +1617,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
1
09
</FileNumber>
<FileNumber>
1
10
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1617,7 +1629,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
11
0
</FileNumber>
<FileNumber>
11
1
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1629,7 +1641,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
11
1
</FileNumber>
<FileNumber>
11
2
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1641,7 +1653,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
11
2
</FileNumber>
<FileNumber>
11
3
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
@@ -1653,7 +1665,7 @@
</File>
<File>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
11
3
</FileNumber>
<FileNumber>
11
4
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
View file @
4f36d69e
...
...
@@ -688,6 +688,11 @@
<FileType>
5
</FileType>
<FilePath>
..\..\..\..\Source\Application\Data_VSpeed.h
</FilePath>
</File>
<File>
<FileName>
Data_Coolant.c
</FileName>
<FileType>
1
</FileType>
<FilePath>
..\..\..\..\Source\Application\Data_Coolant.c
</FilePath>
</File>
</Files>
</Group>
<Group>
...
...
Firmware/Source/Application/Data_Coolant.c
View file @
4f36d69e
#include "Data_Coolant.h"
#include "Components.h"
#if 0
#define FUEL_DATA_TIME 25u /*这里填写多长时间采集一个数据,单位ms*/
#define FUEL_DATA_NUM 20u /*燃油电阻采集数据总数 最大255*/
#define FUEL_CAL_START 5u /*数据排序后取中间部分计算平均:起始*/
#define FUEL_CAL_END 15u /*数据排序后取中间部分计算平均:结束*/
#define Coolant_DATA_TIME 25u
/*这里填写多长时间采集一个数据,单位ms*/
#define Coolant_DATA_NUM 20u
/*燃油电阻采集数据总数 最大255*/
#define Coolant_CAL_START 5u
/*数据排序后取中间部分计算平均:起始*/
#define Coolant_CAL_END 15u
/*数据排序后取中间部分计算平均:结束*/
#define RETURN_DIFFERENCE 25u
/*判断上升或下降的回差,精度0.1*/
#define
FUEL
_SEG_UP 0u
#define
FUEL
_SEG_DOWN 1u
#define
Coolant
_SEG_UP 0u
#define
Coolant
_SEG_DOWN 1u
uint16_t g_u16
FuelData[FUEL
_DATA_NUM];
uint8_t g_u8
Fuel
DataCount = 0u;
uint16_t
g_u16
CoolantData
[
Coolant
_DATA_NUM
];
uint8_t
g_u8
Coolant
DataCount
=
0u
;
uint16_t
Fuel
R = 0u; /*滤波后的燃油电阻,精度0.1*/
static uint16_t
Fuel
RBak = 0;
uint16_t
Coolant
R
=
0u
;
/*滤波后的燃油电阻,精度0.1*/
static
uint16_t
Coolant
RBak
=
0
;
uint8_t g_u8Des
Fuel
Setp = 0u;
uint8_t g_u8Cur
Fuel
Setp = 0u;
uint8_t g_u8
Fuel
InitFlag = 0u;
uint8_t g_u8
Fuel
StateInitFlag = 0u;
uint8_t g_u8
FuelDir = FUEL
_SEG_UP;
FuelSensorSts_t FuelSensorState = Fuel
SensorNormal;
uint16_t g_u16
Fuel
SensorNormalTime = 0u;
uint16_t g_u16
Fuel
SensorShortTime = 0u;
uint16_t g_u16
Fuel
SensorOpenTime = 0u;
uint8_t g_u8
Fuel
ADCompleteFlg = 0u;
uint8_t
g_u8Des
Coolant
Setp
=
0u
;
uint8_t
g_u8Cur
Coolant
Setp
=
0u
;
uint8_t
g_u8
Coolant
InitFlag
=
0u
;
uint8_t
g_u8
Coolant
StateInitFlag
=
0u
;
uint8_t
g_u8
CoolantDir
=
Coolant
_SEG_UP
;
CoolantSensorSts_t
CoolantSensorState
=
Coolant
SensorNormal
;
uint16_t
g_u16
Coolant
SensorNormalTime
=
0u
;
uint16_t
g_u16
Coolant
SensorShortTime
=
0u
;
uint16_t
g_u16
Coolant
SensorOpenTime
=
0u
;
uint8_t
g_u8
Coolant
ADCompleteFlg
=
0u
;
void
Fuel
_KL30_Init(void)
void
Coolant
_KL30_Init
(
void
)
{
g_u8Des
Fuel
Setp = 0u;
g_u8Cur
Fuel
Setp = 0u;
g_u8
Fuel
InitFlag = 1u;
g_u8
Fuel
StateInitFlag = 1u;
g_u8
FuelDir = FUEL
_SEG_UP;
FuelSensorState = Fuel
SensorNormal;
g_u16
Fuel
SensorNormalTime = 0u;
g_u16
Fuel
SensorShortTime = 0u;
g_u16
Fuel
SensorOpenTime = 0u;
g_u8
Fuel
ADCompleteFlg = 0u;
g_u8Des
Coolant
Setp
=
0u
;
g_u8Cur
Coolant
Setp
=
0u
;
g_u8
Coolant
InitFlag
=
1u
;
g_u8
Coolant
StateInitFlag
=
1u
;
g_u8
CoolantDir
=
Coolant
_SEG_UP
;
CoolantSensorState
=
Coolant
SensorNormal
;
g_u16
Coolant
SensorNormalTime
=
0u
;
g_u16
Coolant
SensorShortTime
=
0u
;
g_u16
Coolant
SensorOpenTime
=
0u
;
g_u8
Coolant
ADCompleteFlg
=
0u
;
}
void
Fuel
_KL15_Init(void)
void
Coolant
_KL15_Init
(
void
)
{
g_u8Des
Fuel
Setp = 0u;
g_u8Cur
Fuel
Setp = 0u;
g_u8
Fuel
InitFlag = 1u;
g_u8
Fuel
StateInitFlag = 1u;
g_u8
FuelDir = FUEL
_SEG_UP;
FuelSensorState = Fuel
SensorNormal;
g_u16
Fuel
SensorNormalTime = 0u;
g_u16
Fuel
SensorShortTime = 0u;
g_u16
Fuel
SensorOpenTime = 0u;
g_u8
Fuel
ADCompleteFlg = 0u;
g_u8Des
Coolant
Setp
=
0u
;
g_u8Cur
Coolant
Setp
=
0u
;
g_u8
Coolant
InitFlag
=
1u
;
g_u8
Coolant
StateInitFlag
=
1u
;
g_u8
CoolantDir
=
Coolant
_SEG_UP
;
CoolantSensorState
=
Coolant
SensorNormal
;
g_u16
Coolant
SensorNormalTime
=
0u
;
g_u16
Coolant
SensorShortTime
=
0u
;
g_u16
Coolant
SensorOpenTime
=
0u
;
g_u8
Coolant
ADCompleteFlg
=
0u
;
}
void
Fuel
_R_Cal(uint8_t deltaTime)
void
Coolant
_R_Cal
(
uint8_t
deltaTime
)
{
uint16_t
Fuel
Res = 0;
uint16_t
Coolant
Res
=
0
;
uint8_t
i
,
j
;
uint32_t
temp32
;
static
uint16_t
timeCount
=
0
;
if(g_u8
Fuel
StateInitFlag)
if
(
g_u8
Coolant
StateInitFlag
)
{
FuelR = ADC_Read_Signal(ADC_CH_FUEL
1);
// CoolantR = ADC_Read_Signal(ADC_CH_Coolant
1);
}
if (timeCount >=
FUEL
_DATA_TIME)
if
(
timeCount
>=
Coolant
_DATA_TIME
)
{
timeCount
=
0
;
if (g_u8
FuelDataCount < FUEL
_DATA_NUM)
if
(
g_u8
CoolantDataCount
<
Coolant
_DATA_NUM
)
{
/*获取燃油电阻*/
FuelRes = ADC_Read_Signal(ADC_CH_FUEL
1);
// CoolantRes = ADC_Read_Signal(ADC_CH_Coolant
1);
/*四舍五入*/
if (
Fuel
Res < 3100)
if
(
Coolant
Res
<
3100
)
{
if (
Fuel
Res % 10 >= 5)
if
(
Coolant
Res
%
10
>=
5
)
{
Fuel
Res += 5;
Coolant
Res
+=
5
;
}
}
else
{
Fuel
Res = 0xFFFF;
Coolant
Res
=
0xFFFF
;
}
/*由小到大插入数据*/
for (i = 0; i < g_u8
Fuel
DataCount; i++)
for
(
i
=
0
;
i
<
g_u8
Coolant
DataCount
;
i
++
)
{
if (
FuelRes < g_u16Fuel
Data[i])
if
(
CoolantRes
<
g_u16Coolant
Data
[
i
])
{
break
;
}
}
for (j = g_u8
Fuel
DataCount; j > i; j--)
for
(
j
=
g_u8
Coolant
DataCount
;
j
>
i
;
j
--
)
{
g_u16
FuelData[j] = g_u16Fuel
Data[j - 1];
g_u16
CoolantData
[
j
]
=
g_u16Coolant
Data
[
j
-
1
];
}
g_u16
FuelData[i] = Fuel
Res;
g_u8
Fuel
DataCount++;
g_u16
CoolantData
[
i
]
=
Coolant
Res
;
g_u8
Coolant
DataCount
++
;
}
else
{
/*一组数据采集完毕,取中间部分计算平均值*/
temp32
=
0
;
for (i =
FUEL_CAL_START; i < FUEL
_CAL_END; i++)
for
(
i
=
Coolant_CAL_START
;
i
<
Coolant
_CAL_END
;
i
++
)
{
temp32 += g_u16
Fuel
Data[i];
temp32
+=
g_u16
Coolant
Data
[
i
];
}
FuelR = temp32 / (FUEL_CAL_END - FUEL
_CAL_START);
g_u8
Fuel
DataCount = 0;
g_u8
Fuel
ADCompleteFlg = 1;
CoolantR
=
temp32
/
(
Coolant_CAL_END
-
Coolant
_CAL_START
);
g_u8
Coolant
DataCount
=
0
;
g_u8
Coolant
ADCompleteFlg
=
1
;
}
}
timeCount
+=
deltaTime
;
}
void
Fuel
_State_Check(uint8_t deltaTime)
void
Coolant
_State_Check
(
uint8_t
deltaTime
)
{
if (
Fuel
R < 30)
if
(
Coolant
R
<
30
)
{
/*短路3*/
g_u16
Fuel
SensorOpenTime = 0;
g_u16
Fuel
SensorNormalTime = 0;
if ((g_u16
FuelSensorShortTime > 3000) || ((g_u8FuelStateInitFlag) && (g_u16Fuel
SensorShortTime > 3000)))
g_u16
Coolant
SensorOpenTime
=
0
;
g_u16
Coolant
SensorNormalTime
=
0
;
if
((
g_u16
CoolantSensorShortTime
>
3000
)
||
((
g_u8CoolantStateInitFlag
)
&&
(
g_u16Coolant
SensorShortTime
>
3000
)))
{
FuelSensorState = Fuel
SensorShortCircuit;
g_u8Des
Fuel
Setp = 0;
g_u8Cur
Fuel
Setp = 6;
g_u8
Fuel
StateInitFlag = 0;
g_u8
Fuel
InitFlag = 1;
g_u8
FuelDir = FUEL
_SEG_UP;
CoolantSensorState
=
Coolant
SensorShortCircuit
;
g_u8Des
Coolant
Setp
=
0
;
g_u8Cur
Coolant
Setp
=
6
;
g_u8
Coolant
StateInitFlag
=
0
;
g_u8
Coolant
InitFlag
=
1
;
g_u8
CoolantDir
=
Coolant
_SEG_UP
;
}
else
{
g_u16
Fuel
SensorShortTime += deltaTime;
g_u16
Coolant
SensorShortTime
+=
deltaTime
;
}
}
else if (
Fuel
R > 3100)
else
if
(
Coolant
R
>
3100
)
{
/*开路 310*/
g_u16
Fuel
SensorShortTime = 0;
g_u16
Fuel
SensorNormalTime = 0;
if ((g_u16
FuelSensorOpenTime > 3000) || ((g_u8FuelStateInitFlag) && (g_u16Fuel
SensorOpenTime > 3000)))
g_u16
Coolant
SensorShortTime
=
0
;
g_u16
Coolant
SensorNormalTime
=
0
;
if
((
g_u16
CoolantSensorOpenTime
>
3000
)
||
((
g_u8CoolantStateInitFlag
)
&&
(
g_u16Coolant
SensorOpenTime
>
3000
)))
{
FuelSensorState = Fuel
SensorOpenCircuit;
g_u8Des
Fuel
Setp = 0;
g_u8Cur
Fuel
Setp = 0;
g_u8
Fuel
StateInitFlag = 0;
g_u8
Fuel
InitFlag = 1;
g_u8
FuelDir = FUEL
_SEG_UP;
CoolantSensorState
=
Coolant
SensorOpenCircuit
;
g_u8Des
Coolant
Setp
=
0
;
g_u8Cur
Coolant
Setp
=
0
;
g_u8
Coolant
StateInitFlag
=
0
;
g_u8
Coolant
InitFlag
=
1
;
g_u8
CoolantDir
=
Coolant
_SEG_UP
;
}
else
{
g_u16
Fuel
SensorOpenTime += deltaTime;
g_u16
Coolant
SensorOpenTime
+=
deltaTime
;
}
}
else
{
g_u16
Fuel
SensorShortTime = 0;
g_u16
Fuel
SensorOpenTime = 0;
if (g_u16
Fuel
SensorNormalTime > 3000)
g_u16
Coolant
SensorShortTime
=
0
;
g_u16
Coolant
SensorOpenTime
=
0
;
if
(
g_u16
Coolant
SensorNormalTime
>
3000
)
{
FuelSensorState = Fuel
SensorNormal;
g_u8
Fuel
StateInitFlag = 0;
CoolantSensorState
=
Coolant
SensorNormal
;
g_u8
Coolant
StateInitFlag
=
0
;
}
else
{
g_u16
Fuel
SensorNormalTime += deltaTime;
g_u16
Coolant
SensorNormalTime
+=
deltaTime
;
}
}
}
void
Fuel
_Gauges_Cal(uint8_t deltaTime)
void
Coolant
_Gauges_Cal
(
uint8_t
deltaTime
)
{
static
uint16_t
time
=
0
;
if ((
FuelSensorState == FuelSensorNormal) && (FuelR <= 3100) && (Fuel
R >= 30))
if
((
CoolantSensorState
==
CoolantSensorNormal
)
&&
(
CoolantR
<=
3100
)
&&
(
Coolant
R
>=
30
))
{
/*采集完第一组数据后,开始计算燃油格数*/
if (g_u8
Fuel
ADCompleteFlg)
if
(
g_u8
Coolant
ADCompleteFlg
)
{
if (g_u8
Fuel
InitFlag)
if
(
g_u8
Coolant
InitFlag
)
{
FuelRBak = Fuel
R;
CoolantRBak
=
Coolant
R
;
}
/*根据回差计算走动方向*/
if (g_u8
FuelDir == FUEL
_SEG_UP)
if
(
g_u8
CoolantDir
==
Coolant
_SEG_UP
)
{
if (
FuelR >= Fuel
RBak + RETURN_DIFFERENCE)
if
(
CoolantR
>=
Coolant
RBak
+
RETURN_DIFFERENCE
)
{
g_u8
FuelDir = FUEL
_SEG_DOWN;
FuelRBak = Fuel
R;
g_u8
CoolantDir
=
Coolant
_SEG_DOWN
;
CoolantRBak
=
Coolant
R
;
}
if (
FuelR < Fuel
RBak)
if
(
CoolantR
<
Coolant
RBak
)
{
FuelRBak = Fuel
R;
CoolantRBak
=
Coolant
R
;
}
}
else
{
if (
FuelRBak >= Fuel
R + RETURN_DIFFERENCE)
if
(
CoolantRBak
>=
Coolant
R
+
RETURN_DIFFERENCE
)
{
g_u8
FuelDir = FUEL
_SEG_UP;
FuelRBak = Fuel
R;
g_u8
CoolantDir
=
Coolant
_SEG_UP
;
CoolantRBak
=
Coolant
R
;
}
if (
FuelR > Fuel
RBak)
if
(
CoolantR
>
Coolant
RBak
)
{
FuelRBak = Fuel
R;
CoolantRBak
=
Coolant
R
;
}
}
/*计算目标格数*/
if (g_u8
FuelDir == FUEL
_SEG_UP)
if
(
g_u8
CoolantDir
==
Coolant
_SEG_UP
)
{
if (((g_u8Des
FuelSetp == 5) || g_u8FuelInitFlag) && (Fuel
R < 30))
if
(((
g_u8Des
CoolantSetp
==
5
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
<
30
))
{
g_u8Des
Fuel
Setp = 6;
g_u8Des
Coolant
Setp
=
6
;
}
else if (((g_u8Des
FuelSetp == 4) || g_u8FuelInitFlag) && (Fuel
R < 160))
else
if
(((
g_u8Des
CoolantSetp
==
4
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
<
160
))
{
g_u8Des
Fuel
Setp = 5;
g_u8Des
Coolant
Setp
=
5
;
}
else if (((g_u8Des
FuelSetp == 3) || g_u8FuelInitFlag) && (Fuel
R < 300))
else
if
(((
g_u8Des
CoolantSetp
==
3
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
<
300
))
{
g_u8Des
Fuel
Setp = 4;
g_u8Des
Coolant
Setp
=
4
;
}
else if (((g_u8Des
FuelSetp == 2) || g_u8FuelInitFlag) && (Fuel
R < 500))
else
if
(((
g_u8Des
CoolantSetp
==
2
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
<
500
))
{
g_u8Des
Fuel
Setp = 3;
g_u8Des
Coolant
Setp
=
3
;
}
else if (((g_u8Des
FuelSetp == 1) || g_u8FuelInitFlag) && (Fuel
R < 790))
else
if
(((
g_u8Des
CoolantSetp
==
1
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
<
790
))
{
g_u8Des
Fuel
Setp = 2;
g_u8Des
Coolant
Setp
=
2
;
}
else if (((g_u8Des
FuelSetp == 0) || g_u8FuelInitFlag) && (Fuel
R <= 3100))
else
if
(((
g_u8Des
CoolantSetp
==
0
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
<=
3100
))
{
g_u8Des
Fuel
Setp = 1;
g_u8Des
Coolant
Setp
=
1
;
}
}
else if (g_u8
FuelDir == FUEL
_SEG_DOWN)
else
if
(
g_u8
CoolantDir
==
Coolant
_SEG_DOWN
)
{
if (((g_u8Des
FuelSetp == 1) || g_u8FuelInitFlag) && (Fuel
R > 3100))
if
(((
g_u8Des
CoolantSetp
==
1
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
>
3100
))
{
g_u8Des
Fuel
Setp = 0;
g_u8Des
Coolant
Setp
=
0
;
}
else if (((g_u8Des
FuelSetp == 2) || g_u8FuelInitFlag) && (Fuel
R >= 790))
else
if
(((
g_u8Des
CoolantSetp
==
2
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
>=
790
))
{
g_u8Des
Fuel
Setp = 1;
g_u8Des
Coolant
Setp
=
1
;
}
else if (((g_u8Des
FuelSetp == 3) || g_u8FuelInitFlag) && (Fuel
R >= 500))
else
if
(((
g_u8Des
CoolantSetp
==
3
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
>=
500
))
{
g_u8Des
Fuel
Setp = 2;
g_u8Des
Coolant
Setp
=
2
;
}
else if (((g_u8Des
FuelSetp == 4) || g_u8FuelInitFlag) && (Fuel
R >= 300))
else
if
(((
g_u8Des
CoolantSetp
==
4
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
>=
300
))
{
g_u8Des
Fuel
Setp = 3;
g_u8Des
Coolant
Setp
=
3
;
}
else if (((g_u8Des
FuelSetp == 5) || g_u8FuelInitFlag) && (Fuel
R >= 160))
else
if
(((
g_u8Des
CoolantSetp
==
5
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
>=
160
))
{
g_u8Des
Fuel
Setp = 4;
g_u8Des
Coolant
Setp
=
4
;
}
else if (((g_u8Des
FuelSetp == 6) || g_u8FuelInitFlag) && (Fuel
R >= 30))
else
if
(((
g_u8Des
CoolantSetp
==
6
)
||
g_u8CoolantInitFlag
)
&&
(
Coolant
R
>=
30
))
{
g_u8Des
Fuel
Setp = 5;
g_u8Des
Coolant
Setp
=
5
;
}
}
}
...
...
@@ -276,27 +276,27 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
if
(
Common_GetIgnOnTime
()
>=
3000
)
{
time
+=
deltaTime
;
if (g_u8
Fuel
InitFlag)
if
(
g_u8
Coolant
InitFlag
)
{
g_u8
Fuel
InitFlag = 0;
g_u8
Coolant
InitFlag
=
0
;
time
=
0
;
g_u8Cur
FuelSetp = g_u8DesFuel
Setp;
g_u8Cur
CoolantSetp
=
g_u8DesCoolant
Setp
;
}
if
(
time
>=
15000
)
{
/* 15S变化一格 */
time
=
0
;
if (g_u8Cur
FuelSetp < g_u8DesFuel
Setp)
if
(
g_u8Cur
CoolantSetp
<
g_u8DesCoolant
Setp
)
{
g_u8Cur
Fuel
Setp++;
g_u8Cur
Coolant
Setp
++
;
}
else if (g_u8Cur
FuelSetp > g_u8DesFuel
Setp)
else
if
(
g_u8Cur
CoolantSetp
>
g_u8DesCoolant
Setp
)
{
g_u8Cur
Fuel
Setp--;
g_u8Cur
Coolant
Setp
--
;
}
}
if (g_u8Cur
FuelSetp == g_u8DesFuel
Setp)
if
(
g_u8Cur
CoolantSetp
==
g_u8DesCoolant
Setp
)
{
time
=
0
;
}
...
...
@@ -304,77 +304,76 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
}
}
void
Fuel
_Cal_Sevice(uint8_t deltaTime)
void
Coolant
_Cal_Sevice
(
uint8_t
deltaTime
)
{
/*检测燃油电阻状态*/
Fuel
_State_Check(deltaTime);
Coolant
_State_Check
(
deltaTime
);
/*显示燃油格*/
Fuel
_Gauges_Cal(deltaTime);
Coolant
_Gauges_Cal
(
deltaTime
);
}
uint8_t Get_Cur
Fuel
Setp(void)
uint8_t
Get_Cur
Coolant
Setp
(
void
)
{
uint8_t u8Cur
FuelSetp = g_u8CurFuel
Setp;
if(
FuelSensorState == Fuel
SensorOpenCircuit)
uint8_t
u8Cur
CoolantSetp
=
g_u8CurCoolant
Setp
;
if
(
CoolantSensorState
==
Coolant
SensorOpenCircuit
)
{
if
(
FLASH_SYNC_1Hz
)
{
u8Cur
Fuel
Setp = 6;
u8Cur
Coolant
Setp
=
6
;
}
else
{
u8Cur
Fuel
Setp = 0;
u8Cur
Coolant
Setp
=
0
;
}
}
else if(
FuelSensorState == Fuel
SensorShortCircuit)
else
if
(
CoolantSensorState
==
Coolant
SensorShortCircuit
)
{
if
(
FLASH_SYNC_1Hz
)
{
u8Cur
Fuel
Setp = 7;
u8Cur
Coolant
Setp
=
7
;
}
else
{
u8Cur
Fuel
Setp = 0;
u8Cur
Coolant
Setp
=
0
;
}
}
else if(u8Cur
Fuel
Setp == 1)
else
if
(
u8Cur
Coolant
Setp
==
1
)
{
if
(
FLASH_SYNC_1Hz
)
{
u8Cur
Fuel
Setp = 1;
u8Cur
Coolant
Setp
=
1
;
}
else
{
u8Cur
Fuel
Setp = 0;
u8Cur
Coolant
Setp
=
0
;
}
}
else
{
;
}
return u8Cur
Fuel
Setp;
return
u8Cur
Coolant
Setp
;
}
FuelSensorSts_t Get_Fuel
_Sensor_State(void)
CoolantSensorSts_t
Get_Coolant
_Sensor_State
(
void
)
{
uint8_t u8Cur
Fuel
Setp = 0;
if(
FuelSensorState == FuelSensorOpenCircuit || g_u8CurFuel
Setp == 1u)
uint8_t
u8Cur
Coolant
Setp
=
0
;
if
(
CoolantSensorState
==
CoolantSensorOpenCircuit
||
g_u8CurCoolant
Setp
==
1u
)
{
if
(
FLASH_SYNC_1Hz
)
{
u8Cur
Fuel
Setp = 2;
u8Cur
Coolant
Setp
=
2
;
}
else
{
u8Cur
Fuel
Setp = 0;
u8Cur
Coolant
Setp
=
0
;
}
}
else
{
u8Cur
Fuel
Setp = 1u;
u8Cur
Coolant
Setp
=
1u
;
}
return u8Cur
Fuel
Setp;
return
u8Cur
Coolant
Setp
;
}
#endif
\ No newline at end of file
Firmware/Source/Application/Data_Coolant.h
View file @
4f36d69e
...
...
@@ -5,15 +5,15 @@
typedef
enum
{
Fuel
SensorNormal
=
0
,
Fuel
SensorShortCircuit
,
Fuel
SensorOpenCircuit
,
}
Fuel
SensorSts_t
;
Coolant
SensorNormal
=
0
,
Coolant
SensorShortCircuit
,
Coolant
SensorOpenCircuit
,
}
Coolant
SensorSts_t
;
extern
void
Fuel
_KL15_Init
(
void
);
extern
void
Fuel
_KL30_Init
(
void
);
extern
void
Fuel
_Cal_Sevice
(
uint8_t
deltaTime
);
extern
uint8_t
Get_Cur
Fuel
Setp
(
void
);
extern
FuelSensorSts_t
Get_Fuel
_Sensor_State
(
void
);
void
Fuel
_R_Cal
(
uint8_t
deltaTime
);
extern
void
Coolant
_KL15_Init
(
void
);
extern
void
Coolant
_KL30_Init
(
void
);
extern
void
Coolant
_Cal_Sevice
(
uint8_t
deltaTime
);
extern
uint8_t
Get_Cur
Coolant
Setp
(
void
);
extern
CoolantSensorSts_t
Get_Coolant
_Sensor_State
(
void
);
void
Coolant
_R_Cal
(
uint8_t
deltaTime
);
#endif
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