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
82a9f6ca
Commit
82a9f6ca
authored
Aug 13, 2024
by
时昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:增加公英制切换功能
parent
135bbb3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
32 deletions
+32
-32
Services_Mileage_User.c
Firmware/Source/Component/Mileage/Services_Mileage_User.c
+32
-32
No files found.
Firmware/Source/Component/Mileage/Services_Mileage_User.c
View file @
82a9f6ca
...
...
@@ -75,7 +75,7 @@ void Data_User_Mileage_KL30Init(void)
{
ODOInit
.
Offset
=
TempBuf
[
2
];
}
ODOInit
.
MaxValue
=
16103058
;
ODOInit
.
MaxValue
=
9999999
;
Data_ODO_KL30_Init
(
DataODOBuf
,
&
ODOInit
,
Func
.
EEPromWrite_Cbk
);
(
void
)
Data_User_EEPROM_Read
(
EM_TRIP_BLOCK
,
TempBuf
+
3
,
8
);
...
...
@@ -194,18 +194,18 @@ void Services_Mileage_Callback(void)
uint32_t
Get_ODO_Value
(
void
)
{
uint32_t
ODO
=
0
;
//
if (Get_Dis_Unit() == 0) /* 公制 */
//
{
//
ODO = Data_ODO_Read();
//
}
//
else if (Get_Dis_Unit() == 1) /* 英制 */
//
{
//
ODO = Data_Km_To_Mile(Data_ODO_Read());
//
}
//
else /* 无效值,按照公里处理,理论上不会执行到这 */
//
{
//
ODO = Data_ODO_Read();
//
}
if
(
Get_Dis_Unit
()
==
0
)
/* 公制 */
{
ODO
=
Data_ODO_Read
();
}
else
if
(
Get_Dis_Unit
()
==
1
)
/* 英制 */
{
ODO
=
Data_Km_To_Mile
(
Data_ODO_Read
());
}
else
/* 无效值,按照公里处理,理论上不会执行到这 */
{
ODO
=
Data_ODO_Read
();
}
return
ODO
;
}
...
...
@@ -216,18 +216,18 @@ uint32_t Get_ODO_Value(void)
uint32_t
Get_Trip_Value
(
void
)
{
uint32_t
Trip
=
0
;
//
if (Get_Dis_Unit() == 0) /* 公制 */
//
{
//
Trip = Data_Read_Trip(EM_TRIP_A);
//
}
//
else if (Get_Dis_Unit() == 1) /* 英制 */
//
{
//
Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
//
}
//
else /* 无效值,按照公里处理,理论上不会执行到这 */
//
{
//
Trip = Data_Read_Trip(EM_TRIP_A);
//
}
if
(
Get_Dis_Unit
()
==
0
)
/* 公制 */
{
Trip
=
Data_Read_Trip
(
EM_TRIP_A
);
}
else
if
(
Get_Dis_Unit
()
==
1
)
/* 英制 */
{
Trip
=
Data_Km_To_Mile
(
Data_Read_Trip
(
EM_TRIP_A
));
}
else
/* 无效值,按照公里处理,理论上不会执行到这 */
{
Trip
=
Data_Read_Trip
(
EM_TRIP_A
);
}
return
Trip
;
}
...
...
@@ -237,13 +237,13 @@ uint32_t Get_Trip_Value(void)
*/
void
Trip_Clear_Km_Service
(
void
)
{
//
if (Get_Dis_Unit() == 0) /* 公制 */
//
{
//
if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时,里程大于999.9KM进行清零 */
//
{
//
Data_Clear_Trip_All();
//
}
//
}
if
(
Get_Dis_Unit
()
==
0
)
/* 公制 */
{
if
(
Data_Read_Trip
(
EM_TRIP_A
)
>
9999
)
/* 当前单位在KM时,里程大于999.9KM进行清零 */
{
Data_Clear_Trip_All
();
}
}
}
...
...
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