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
970de49c
Commit
970de49c
authored
Oct 06, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整禅道要求WET图标显示
parent
11087aec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
CAN_FUNC.c
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
+2
-2
GUI.c
source/Application/Graphic/GUI/GUI.c
+7
-5
No files found.
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @
970de49c
...
...
@@ -111,7 +111,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Service_Brake_Circuit2_AirPressure
=
0u
;
}
}
else
if
((
K_Line_Set
.
K_Line_LID42
==
0x01u
)
||
f
(
K_Line_Set
.
K_Line_LID42
==
0x02u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x03u
))
else
if
((
K_Line_Set
.
K_Line_LID42
==
0x01u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x02u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x03u
))
{
if
(
Common_Get_Air1_Data
()
!=
0u
)
{
...
...
@@ -2454,4 +2454,4 @@ void DoCAN_Get_Multi_frameE8_Recv(void)
ECM18EBFFE8
.
bCtrByte
=
0
;
}
}
}
\ No newline at end of file
}
source/Application/Graphic/GUI/GUI.c
View file @
970de49c
...
...
@@ -686,6 +686,7 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
current_value
=
GetGaugesCurrentPos
(
WETGasGauges
);
current_Flag
=
Common_Get_WET_Valid
();
/*有效性判断用*/
/*禅道488*/
if
((
current_value
<=
17u
)
&&
(
current_Flag
==
1u
))
{
switch
(
current_value
)
...
...
@@ -730,19 +731,19 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
GUI_Translate_Display
(
WET_Sprite
,
CN_qiyazouge_01
,
(
145u
+
8u
*
0x01
),
405u
,
GUI_BLENDMODE_SRC_OVER
);
case
0x01u
:
GUI_Translate_Display
(
WET_Sprite
,
CN_qiyazouge_01
,
(
145u
+
8u
*
0x00
),
405u
,
GUI_BLENDMODE_SRC_OVER
);
GUI_General_Display
(
WET_Sprite
,
CN_qiyafuhaodeng
,
GUI_BLENDMODE_SRC_OVER
);
/*气压符号灯。*/
case
0x00u
:
GUI_General_Display
(
WET_Sprite
,
CN_qiya
,
GUI_BLENDMODE_SRC_OVER
);
/*刷长条的气压表框。*/
break
;
default:
GUI_General_Display
(
WET_Sprite
,
CN_qiyafuhaodeng
,
GUI_BLENDMODE_SRC_OVER
);
/*气压符号灯。*/
//GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break
;
}
//
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
GUI_General_Display
(
WET_Sprite
,
CN_qiyafuhaodeng
,
GUI_BLENDMODE_SRC_OVER
);
/*气压符号灯。*/
}
else
{
GUI_General_Display
(
WET_Sprite
,
SpriteSize
,
GUI_BLENDMODE_SRC_OVER
);
//GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display
(
WET_Sprite
,
CN_qiyafuhaodeng
,
GUI_BLENDMODE_SRC_OVER
);
}
}
else
...
...
@@ -4349,7 +4350,8 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
if
((
CanStatus
==
CAN_SIG_LOST
)
||
(
State_Flag
.
Engine_Oil_Time
>=
100u
))
/*此报文掉线5S*/
{
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu3_01_12
,
GUI_BLENDMODE_SRC_OVER
);
/*距离更换*/
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu3_01_ERROR
,
GUI_BLENDMODE_SRC_OVER
);
/*error*/
/*禅道698*/
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_ERROR, GUI_BLENDMODE_SRC_OVER); /*error*/
}
else
{
...
...
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