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
7ae2074b
Commit
7ae2074b
authored
Nov 29, 2024
by
张金硕
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jinshuo' into 'dev'
🐞
fix:增加小计最大值,英制时小计大于999.9时清小计 See merge request
!112
parents
f9f41321
c167fd00
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
Services_Mileage_User.c
Firmware/Source/Component/Mileage/Services_Mileage_User.c
+9
-1
No files found.
Firmware/Source/Component/Mileage/Services_Mileage_User.c
View file @
7ae2074b
...
...
@@ -97,7 +97,7 @@ void Data_User_Mileage_KL30Init(void)
TripInit
[
EM_TRIP_A
].
Offset
=
TempBuf
[
4
];
}
// TripInit[EM_TRIP_A].Offset = TempBuf[4];
TripInit
[
EM_TRIP_A
].
MaxValue
=
16
1
00
;
/* 最大999.9Mile 进行复位 */
TripInit
[
EM_TRIP_A
].
MaxValue
=
16
2
00
;
/* 最大999.9Mile 进行复位 */
TripInit
[
EM_TRIP_A
].
IsRestart
=
1u
;
// TripInit[EM_TRIP_B].Stamp = 0xFFFFFFFFu;
...
...
@@ -261,6 +261,14 @@ void Trip_Clear_Km_Service(void)
Data_Clear_Trip_All
();
}
}
else
{
Millib_uint32_t
mile_data
=
Data_Km_To_Mile
(
Data_Read_Trip
(
EM_TRIP_A
));
if
(
mile_data
>
9999
)
/* 当前单位在Mile时,里程大于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