Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VC66_7C
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
ISUZU
VC66_7C
Commits
45e89c2d
Commit
45e89c2d
authored
May 13, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整BUG
parent
2745e5ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
Key_user.c
source/Application/APP/Key/Key_user.c
+1
-2
CAN_FUNC.c
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
+5
-3
No files found.
source/Application/APP/Key/Key_user.c
View file @
45e89c2d
...
...
@@ -1510,6 +1510,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
HMI_MENU_Sta
=
Get_Cur_HMI
();
DispVSpeed
=
Common_Get_Disp_V_Speed
();
PowerStatus
=
Common_Get_IG_Sts
();
if
(
enKeyEvent
==
KEY_EVENT_OFF_TO_ON
)
{
...
...
@@ -1517,8 +1518,6 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
}
else
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
PowerStatus
=
Common_Get_IG_Sts
();
if
(
PowerStatus
==
COMMON_POWER_ON
)
{
if
(
HMI_MENU_Sta
==
Display_StartAnimation
)
...
...
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @
45e89c2d
...
...
@@ -409,9 +409,13 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
/*手刹状态*/
if
(
Line_In_Get_Status
(
LINE_IN_PARK_BRAKE
)
==
1u
)
{
SW_Parking
=
1
;
}
else
{
SW_Parking
=
0
;
}
/*水温状态*/
if
((
Get_ID_18FEEE00_Sig_Engine_Coolant_Temperature
()
>
0xFA
)
||
...
...
@@ -422,7 +426,6 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
else
if
((
Coolant_Get_CurSeg
()
>=
0
)
&&
(
Coolant_Get_CurSeg
()
<
11
))
{
Water_Temp_Level
=
0
;
}
else
if
((
Coolant_Get_CurSeg
()
>=
11
)
&&
(
Coolant_Get_CurSeg
()
<=
12
))
{
...
...
@@ -436,7 +439,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
}
}
if
((
Coolant_Get_Valid
()
==
1u
)
&&
(
Coolant_Get_CurSeg
()
>=
12u
))
if
((
Coolant_Get_Valid
()
==
1u
)
&&
(
Coolant_Get_CurSeg
()
>=
12u
)
&&
(
HMI_MENU_Sta
!=
Display_StartAnimation
)
)
{
Water_Temp_Level_Flag
=
1u
;
}
...
...
@@ -452,7 +455,6 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
else
{
Over_Heat_Warning_Status
=
0
;
}
/*电源电压*/
...
...
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