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
55a6c075
Commit
55a6c075
authored
Dec 27, 2021
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整按键AD采集数值,调整胎温显示图片
parent
8372dd31
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
38 deletions
+38
-38
Key_user.c
source/Application/APP/Key/Key_user.c
+14
-14
GUI.c
source/Application/Graphic/GUI/GUI.c
+24
-24
No files found.
source/Application/APP/Key/Key_user.c
View file @
55a6c075
...
@@ -65,7 +65,7 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
...
@@ -65,7 +65,7 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
{
/*主界面 一级菜单 二级菜单那*/
/*主界面 一级菜单 二级菜单那*/
if
(((
bCurMenuIDX
>=
_MN_DSP_LEVEL1MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_6_MENU_2
))
||
if
(((
bCurMenuIDX
>=
_MN_DSP_LEVEL1MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_6_MENU_2
))
||
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
{
{
/*故障码*/
/*故障码*/
if
((
CanStatus1
==
CAN_SIG_LOST
)
&&
(
bCurMenuIDX
==
_MN_DSP_LEVEL2MENU_2
))
if
((
CanStatus1
==
CAN_SIG_LOST
)
&&
(
bCurMenuIDX
==
_MN_DSP_LEVEL2MENU_2
))
...
@@ -367,7 +367,7 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
...
@@ -367,7 +367,7 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
{
/*主界面 一级菜单 二级菜单*/
/*主界面 一级菜单 二级菜单*/
if
(((
bCurMenuIDX
>=
_MN_DSP_LEVEL1MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_6_MENU_2
))
||
if
(((
bCurMenuIDX
>=
_MN_DSP_LEVEL1MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL2_6_MENU_2
))
||
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
{
{
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_DOWN
);
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_DOWN
);
}
}
...
@@ -660,7 +660,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
...
@@ -660,7 +660,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
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_6_MENU_2
))
||
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
((
bCurMenuIDX
>=
_MN_DSP_LEVEL3_4_MENU_41
)
&&
(
bCurMenuIDX
<=
_MN_DSP_LEVEL3_4_MENU_47
)))
{
{
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_ENTER
);
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_ENTER
);
}
}
...
@@ -1007,7 +1007,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Up(void)
...
@@ -1007,7 +1007,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Up(void)
}
}
else
else
{
{
if
((
Key_R
>=
(
1200
-
400
))
&&
(
Key_R
<=
(
1200
+
4
00
)))
if
((
Key_R
>=
(
1200
-
300
))
&&
(
Key_R
<=
(
1200
+
3
00
)))
{
{
enKeyRealStatus
=
KEY_LINE_PRESS
;
enKeyRealStatus
=
KEY_LINE_PRESS
;
}
}
...
@@ -1034,7 +1034,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Down(void)
...
@@ -1034,7 +1034,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Down(void)
}
}
else
else
{
{
if
((
Key_R
>=
(
2
700
-
400
))
&&
(
Key_R
<=
(
2700
+
4
00
)))
if
((
Key_R
>=
(
2
500
-
300
))
&&
(
Key_R
<=
(
2500
+
3
00
)))
{
{
enKeyRealStatus
=
KEY_LINE_PRESS
;
enKeyRealStatus
=
KEY_LINE_PRESS
;
}
}
...
@@ -1061,7 +1061,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void)
...
@@ -1061,7 +1061,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void)
}
}
else
else
{
{
if
((
Key_R
>=
(
4
800
-
400
))
&&
(
Key_R
<=
(
50
00
+
400
)))
if
((
Key_R
>=
(
4
300
-
400
))
&&
(
Key_R
<=
(
43
00
+
400
)))
{
{
enKeyRealStatus
=
KEY_LINE_PRESS
;
enKeyRealStatus
=
KEY_LINE_PRESS
;
}
}
...
@@ -1087,7 +1087,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void)
...
@@ -1087,7 +1087,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void)
}
}
else
else
{
{
if
((
Key_R
>=
(
8000
-
400
))
&&
(
Key_R
<=
(
8
000
+
400
)))
if
((
Key_R
>=
(
7000
-
400
))
&&
(
Key_R
<=
(
7
000
+
400
)))
{
{
enKeyRealStatus
=
KEY_LINE_PRESS
;
enKeyRealStatus
=
KEY_LINE_PRESS
;
}
}
...
@@ -1114,7 +1114,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
...
@@ -1114,7 +1114,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
}
}
else
else
{
{
if
((
Key_R
>=
(
550
-
300
))
&&
(
Key_R
<=
(
55
0
+
300
)))
if
((
Key_R
>=
(
400
-
300
))
&&
(
Key_R
<=
(
40
0
+
300
)))
{
{
enKeyRealStatus
=
KEY_LINE_PRESS
;
enKeyRealStatus
=
KEY_LINE_PRESS
;
}
}
...
@@ -1129,12 +1129,12 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
...
@@ -1129,12 +1129,12 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
/*---------------------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------------------*/
const
Key_Attribute_st_t
stKeyAttribute
[
KEY_NUM_MAX
]
=
const
Key_Attribute_st_t
stKeyAttribute
[
KEY_NUM_MAX
]
=
{
{
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Up
,
Key_Operation_Up
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Up
,
Key_Operation_Up
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Down
,
Key_Operation_Down
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Down
,
Key_Operation_Down
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Enter
,
Key_Operation_Enter
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Enter
,
Key_Operation_Enter
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Return
,
Key_Operation_Return
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Return
,
Key_Operation_Return
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Menu
,
Key_Operation_Menu
},
{
KEY_NEED_DEBOUNCE_NORMAL
,
Key_Real_Status_Read_Menu
,
Key_Operation_Menu
},
};
};
Key_IGN_en_t
Key_Get_IGN_Status
(
void
)
Key_IGN_en_t
Key_Get_IGN_Status
(
void
)
...
...
source/Application/Graphic/GUI/GUI.c
View file @
55a6c075
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