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
f945a84d
Commit
f945a84d
authored
Aug 08, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:54867 【豪进750TFT】【里程】发送车速,里程不累计 里程累积并储存
parent
b311fae0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
27 deletions
+25
-27
Services_Mileage_User.c
Firmware/Source/Component/Mileage/Services_Mileage_User.c
+24
-24
Sys_Task_List.c
Firmware/Source/System/Sys_Task_List.c
+1
-3
No files found.
Firmware/Source/Component/Mileage/Services_Mileage_User.c
View file @
f945a84d
...
@@ -194,18 +194,18 @@ void Services_Mileage_Callback(void)
...
@@ -194,18 +194,18 @@ void Services_Mileage_Callback(void)
uint32_t
Get_ODO_Value
(
void
)
uint32_t
Get_ODO_Value
(
void
)
{
{
uint32_t
ODO
=
0
;
uint32_t
ODO
=
0
;
//
if (Get_Dis_Unit() == 0) /* 公制 */
if
(
Get_Dis_Unit
()
==
0
)
/* 公制 */
//
{
{
//
ODO = Data_ODO_Read();
ODO
=
Data_ODO_Read
();
//
}
}
//
else if (Get_Dis_Unit() == 1) /* 英制 */
else
if
(
Get_Dis_Unit
()
==
1
)
/* 英制 */
//
{
{
//
ODO = Data_Km_To_Mile(Data_ODO_Read());
ODO
=
Data_Km_To_Mile
(
Data_ODO_Read
());
//
}
}
//
else /* 无效值,按照公里处理,理论上不会执行到这 */
else
/* 无效值,按照公里处理,理论上不会执行到这 */
//
{
{
//
ODO = Data_ODO_Read();
ODO
=
Data_ODO_Read
();
//
}
}
return
ODO
;
return
ODO
;
}
}
...
@@ -216,18 +216,18 @@ uint32_t Get_ODO_Value(void)
...
@@ -216,18 +216,18 @@ uint32_t Get_ODO_Value(void)
uint32_t
Get_Trip_Value
(
void
)
uint32_t
Get_Trip_Value
(
void
)
{
{
uint32_t
Trip
=
0
;
uint32_t
Trip
=
0
;
//
if (Get_Dis_Unit() == 0) /* 公制 */
if
(
Get_Dis_Unit
()
==
0
)
/* 公制 */
//
{
{
//
Trip = Data_Read_Trip(EM_TRIP_A);
Trip
=
Data_Read_Trip
(
EM_TRIP_A
);
//
}
}
//
else if (Get_Dis_Unit() == 1) /* 英制 */
else
if
(
Get_Dis_Unit
()
==
1
)
/* 英制 */
//
{
{
//
Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
Trip
=
Data_Km_To_Mile
(
Data_Read_Trip
(
EM_TRIP_A
));
//
}
}
//
else /* 无效值,按照公里处理,理论上不会执行到这 */
else
/* 无效值,按照公里处理,理论上不会执行到这 */
//
{
{
//
Trip = Data_Read_Trip(EM_TRIP_A);
Trip
=
Data_Read_Trip
(
EM_TRIP_A
);
//
}
}
return
Trip
;
return
Trip
;
}
}
...
...
Firmware/Source/System/Sys_Task_List.c
View file @
f945a84d
...
@@ -70,14 +70,12 @@ uint32_t aaa = 0;
...
@@ -70,14 +70,12 @@ uint32_t aaa = 0;
void
Sys_100ms_Tasks
(
void
)
void
Sys_100ms_Tasks
(
void
)
{
{
ODOtest
=
Data_ODO_Read
();
Triptest
=
Data_Read_Trip
(
0
);
S3_ServerCNTT
();
S3_ServerCNTT
();
Get_DisTime_Service
();
Get_DisTime_Service
();
Fuel_Cal_Sevice
(
100u
);
Fuel_Cal_Sevice
(
100u
);
Coolant_Cal_Sevice
(
100u
);
Coolant_Cal_Sevice
(
100u
);
Services_Mileage_Callback
();
Services_Mileage_Callback
();
//Data_Mileage_Clear();
//
Data_Mileage_Clear();
RTE_GPIO_Config
(
RTE_GPIO_PORT05_PIN04
,
GpioOut_High
);
RTE_GPIO_Config
(
RTE_GPIO_PORT05_PIN04
,
GpioOut_High
);
...
...
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