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
cb19499f
Commit
cb19499f
authored
3 years ago
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加系统演示模式配置功能
parent
a6d23568
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
18 deletions
+50
-18
Key_user.c
source/Application/APP/Key/Key_user.c
+18
-14
GUI.c
source/Application/Graphic/GUI/GUI.c
+32
-4
No files found.
source/Application/APP/Key/Key_user.c
View file @
cb19499f
...
...
@@ -83,24 +83,16 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
}
}
/*系统演示模式子菜单*/
else
if
((
bCurMenuIDX
>=
_MN_DSP_LEVEL2_5_MENU_1
)
&&
(
_MN_DSP_LEVEL2_5_MENU_4
<=
_MN_DSP_LEVEL2_5_MENU_1
))
else
if
((
bCurMenuIDX
>=
_MN_DSP_LEVEL2_5_MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_5_MENU_4
))
{
/*if (
)
if
((
K_Line_Set
.
K_Line_LID27
!=
0x01u
)
&&
(
bCurMenuIDX
==
_MN_DSP_LEVEL2_5_MENU_2
)
)
{
}
else if ()
{
}
else if ()
{
;
/*Do Nothing!*/
}
else
{
}
*/
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_UP
);
}
}
/*保养通知设定 更换机油&机油滤清器*/
else
if
(
bCurMenuIDX
==
_MN_DSP_LEVEL3_3_MENU_1
)
...
...
@@ -428,6 +420,18 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_DOWN
);
}
}
/*系统演示模式子菜单*/
else
if
((
bCurMenuIDX
>=
_MN_DSP_LEVEL2_5_MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_5_MENU_4
))
{
if
((
K_Line_Set
.
K_Line_LID28
!=
0x01u
)
&&
(
bCurMenuIDX
==
_MN_DSP_LEVEL2_5_MENU_1
))
{
;
/*Do Nothing!*/
}
else
{
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_DOWN
);
}
}
/*保养通知设定 更换机油&机油滤清器*/
else
if
(
bCurMenuIDX
==
_MN_DSP_LEVEL3_3_MENU_1
)
{
...
...
@@ -742,7 +746,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
{
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
if
(((
bCurMenuIDX
>=
_MN_DSP_LEVEL2MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_
6_MENU_2
))
||
if
(((
bCurMenuIDX
>=
_MN_DSP_LEVEL2MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_
5_MENU_4
))
||
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
{
/*系统演示模式*/
...
...
This diff is collapsed.
Click to expand it.
source/Application/Graphic/GUI/GUI.c
View file @
cb19499f
...
...
@@ -2951,19 +2951,47 @@ void GUI_BG_Demo_Menu_Display(uint8_t Mode)
if
(
bCurMenuIDX
!=
_MN_DSP_LEVEL2_5_MENU_1
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_1black
+
State_Flag
.
DEMO_LDWS
),
225u
,
GUI_DISP_MENU_Y
[
0u
],
GUI_BLENDMODE_SRC_OVER
);
if
(
K_Line_Set
.
K_Line_LID27
==
0x01u
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_1black
+
State_Flag
.
DEMO_LDWS
),
225u
,
GUI_DISP_MENU_Y
[
0u
],
GUI_BLENDMODE_SRC_OVER
);
}
else
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_1black
+
1u
),
225u
,
GUI_DISP_MENU_Y
[
0u
],
GUI_BLENDMODE_SRC_OVER
);
}
}
if
(
bCurMenuIDX
!=
_MN_DSP_LEVEL2_5_MENU_2
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_2black
+
State_Flag
.
DEMO_AEBS1
),
225u
,
GUI_DISP_MENU_Y
[
1u
],
GUI_BLENDMODE_SRC_OVER
);
if
(
K_Line_Set
.
K_Line_LID28
==
0x01u
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_2black
+
State_Flag
.
DEMO_AEBS1
),
225u
,
GUI_DISP_MENU_Y
[
1u
],
GUI_BLENDMODE_SRC_OVER
);
}
else
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_2black
+
1u
),
225u
,
GUI_DISP_MENU_Y
[
1u
],
GUI_BLENDMODE_SRC_OVER
);
}
}
if
(
bCurMenuIDX
!=
_MN_DSP_LEVEL2_5_MENU_3
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_3black
+
State_Flag
.
DEMO_AEBS2
),
225u
,
GUI_DISP_MENU_Y
[
2u
],
GUI_BLENDMODE_SRC_OVER
);
if
(
K_Line_Set
.
K_Line_LID28
==
0x01u
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_3black
+
State_Flag
.
DEMO_AEBS2
),
225u
,
GUI_DISP_MENU_Y
[
2u
],
GUI_BLENDMODE_SRC_OVER
);
}
else
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_3black
+
1u
),
225u
,
GUI_DISP_MENU_Y
[
2u
],
GUI_BLENDMODE_SRC_OVER
);
}
}
if
(
bCurMenuIDX
!=
_MN_DSP_LEVEL2_5_MENU_4
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_4black
+
State_Flag
.
DEMO_AEBS3
),
225u
,
GUI_DISP_MENU_Y
[
3u
],
GUI_BLENDMODE_SRC_OVER
);
if
(
K_Line_Set
.
K_Line_LID28
==
0x01u
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_4black
+
State_Flag
.
DEMO_AEBS3
),
225u
,
GUI_DISP_MENU_Y
[
3u
],
GUI_BLENDMODE_SRC_OVER
);
}
else
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_05_4black
+
1u
),
225u
,
GUI_DISP_MENU_Y
[
3u
],
GUI_BLENDMODE_SRC_OVER
);
}
}
}
else
...
...
This diff is collapsed.
Click to expand it.
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