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
fa2b12e1
Commit
fa2b12e1
authored
Jun 09, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加工厂模式DTC显示功能。
parent
5caaf748
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
485 additions
and
104 deletions
+485
-104
GUI.c
source/Application/Graphic/GUI/GUI.c
+153
-30
Menu.h
source/Application/Graphic/Menu/Menu.h
+60
-60
Menu_user.c
source/Application/Graphic/Menu/Menu_user.c
+272
-14
No files found.
source/Application/Graphic/GUI/GUI.c
View file @
fa2b12e1
...
...
@@ -7510,36 +7510,29 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode)
{
uint8_t
DTCNumCode
=
0u
;
uint32_t
DTNumValue
=
0u
;
uint8_t
Dig
[
5
]
;
//uint32_t DTNum = 0u
;
if
(
DTCNumTime
==
1
)
DTNum
=
DisDTCNumber
[
DTCDispNum
];
if
(
DTCNumTime
<
50
)
{
if
(
DTCDispNum
==
DisDTCNum
)
{
DTCDispNum
=
0
;
}
DTCNumTime
++
;
}
else
{
DTCNumTime
=
0u
;
DT
Num
=
DisDTCNumber
[
DTCDispNum
]
;
DT
CDispNum
++
;
if
(
DTCDispNum
<
DisDTCNum
)
if
(
DTCDispNum
>=
DisDTCNum
)
{
DTCDispNum
++
;
DTCDispNum
=
0u
;
}
}
DTCNumCode
=
(
uint8_t
)(
DTNum
>>
28u
);
DTNumValue
=
((
DTNum
>>
0x08u
)
&
0xFFFFFFu
);
//Dig[0] = (uint8_t)(DTNumValue % 16u);
//DTNumValue = DTNumValue / 16;
//Dig[1] = (uint8_t)(DTNumValue % 16u);
//DTNumValue = DTNumValue / 16;
//Dig[2] = (uint8_t)(DTNumValue % 16u);
//DTNumValue = DTNumValue / 16;
//Dig[3] = (uint8_t)(DTNumValue % 16u);
//DTNumValue = DTNumValue / 16;
//Dig[4] = (uint8_t)(DTNumValue % 16u);
if
(
Mode
==
GUI_DISP_MODE_NORMAL
)
{
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu2_01_wenzi
,
GUI_BLENDMODE_SRC_OVER
);
/*menu*/
...
...
@@ -7638,12 +7631,6 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode)
GUI_Translate_Display
(
MENU_Sprite
,
CN_Nb_28_heng
,
498u
,
262u
,
GUI_BLENDMODE_SRC_OVER
);
/*-*/
//GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[Dig[0]], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
//GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[Dig[1]], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
//GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[Dig[2]], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
//GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[Dig[3]], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
//GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[Dig[4]], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit16_Display
(
MENU_Sprite
,
DTNumValue
,
CN_Nb_28_0
,
5u
,
0u
,
GUIBGDTCPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
}
else
...
...
@@ -7729,9 +7716,33 @@ void GUI_BG_MenuDTCEngine_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void
GUI_BG_DTCBrake_Display
(
uint8_t
Mode
)
{
uint8_t
DTCNumCode
=
0u
;
uint32_t
DTNumValue
=
0u
;
uint32_t
Data_Value
=
0u
;
Data_Value
=
ECM18EBFF00
.
DataDTC
.
SubDTC
.
StructDTC
[
0
];
//DTNum = DisDTCNumber[DTCDispNum];
Data_Value
=
DisDTCNumber
[
DTCDispNum
];
swap32
(
&
Data_Value
);
Data_Value
=
(
uint32_t
)(
Data_Value
&
0xFFFFu
);
if
(
DTCNumTime
<
50
)
{
DTCNumTime
++
;
}
else
{
DTCNumTime
=
0u
;
DTCDispNum
++
;
if
(
DTCDispNum
>=
DisDTCNum
)
{
DTCDispNum
=
0u
;
}
}
//DTCNumCode = (uint8_t)(DTNum >> 28u);
//DTNumValue = ((DTNum >> 0x08u) & 0xFFFFFFu);
if
(
Mode
==
GUI_DISP_MODE_NORMAL
)
{
...
...
@@ -7831,6 +7842,34 @@ void GUI_BG_MenuDTCBrake_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void
GUI_BG_DTCAMT_Display
(
uint8_t
Mode
)
{
uint8_t
DTCNumCode
=
0u
;
uint32_t
DTNumValue
=
0u
;
uint32_t
Data_Value
=
0u
;
//DTNum = DisDTCNumber[DTCDispNum];
Data_Value
=
DisDTCNumber
[
DTCDispNum
];
swap32
(
&
Data_Value
);
Data_Value
=
(
uint32_t
)(
Data_Value
&
0xFFFFu
);
if
(
DTCNumTime
<
50
)
{
DTCNumTime
++
;
}
else
{
DTCNumTime
=
0u
;
DTCDispNum
++
;
if
(
DTCDispNum
>=
DisDTCNum
)
{
DTCDispNum
=
0u
;
}
}
//DTCNumCode = (uint8_t)(DTNum >> 28u);
//DTNumValue = ((DTNum >> 0x08u) & 0xFFFFFFu);
if
(
Mode
==
GUI_DISP_MODE_NORMAL
)
{
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu2_01_wenzi
,
GUI_BLENDMODE_SRC_OVER
);
/*menu*/
...
...
@@ -7845,7 +7884,7 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode)
GUI_Translate_Display
(
MENU_Sprite
,
CN_Nb_28_heng
,
406u
,
262u
,
GUI_BLENDMODE_SRC_OVER
);
/*-*/
GUI_General_Digit16_Display
(
MENU_Sprite
,
8888
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
GUI_General_Digit16_Display
(
MENU_Sprite
,
Data_Value
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
}
else
{
...
...
@@ -7929,6 +7968,34 @@ void GUI_BG_MenuDTCAMT_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void
GUI_BG_DTCRadar_Display
(
uint8_t
Mode
)
{
uint8_t
DTCNumCode
=
0u
;
uint32_t
DTNumValue
=
0u
;
uint32_t
Data_Value
=
0u
;
//DTNum = DisDTCNumber[DTCDispNum];
Data_Value
=
DisDTCNumber
[
DTCDispNum
];
swap32
(
&
Data_Value
);
Data_Value
=
(
uint32_t
)(
Data_Value
&
0xFFFFu
);
if
(
DTCNumTime
<
50
)
{
DTCNumTime
++
;
}
else
{
DTCNumTime
=
0u
;
DTCDispNum
++
;
if
(
DTCDispNum
>=
DisDTCNum
)
{
DTCDispNum
=
0u
;
}
}
//DTCNumCode = (uint8_t)(DTNum >> 28u);
//DTNumValue = ((DTNum >> 0x08u) & 0xFFFFFFu);
if
(
Mode
==
GUI_DISP_MODE_NORMAL
)
{
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu2_01_wenzi
,
GUI_BLENDMODE_SRC_OVER
);
/*menu*/
...
...
@@ -7943,7 +8010,7 @@ void GUI_BG_DTCRadar_Display(uint8_t Mode)
GUI_Translate_Display
(
MENU_Sprite
,
CN_Nb_28_heng
,
406u
,
262u
,
GUI_BLENDMODE_SRC_OVER
);
/*-*/
GUI_General_Digit16_Display
(
MENU_Sprite
,
8888
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
GUI_General_Digit16_Display
(
MENU_Sprite
,
Data_Value
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
}
else
{
...
...
@@ -8028,6 +8095,34 @@ void GUI_BG_MenuDTCRadar_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void
GUI_BG_DTCCamera_Display
(
uint8_t
Mode
)
{
uint8_t
DTCNumCode
=
0u
;
uint32_t
DTNumValue
=
0u
;
uint32_t
Data_Value
=
0u
;
//DTNum = DisDTCNumber[DTCDispNum];
Data_Value
=
DisDTCNumber
[
DTCDispNum
];
swap32
(
&
Data_Value
);
Data_Value
=
(
uint32_t
)(
Data_Value
&
0xFFFFu
);
if
(
DTCNumTime
<
50
)
{
DTCNumTime
++
;
}
else
{
DTCNumTime
=
0u
;
DTCDispNum
++
;
if
(
DTCDispNum
>=
DisDTCNum
)
{
DTCDispNum
=
0u
;
}
}
//DTCNumCode = (uint8_t)(DTNum >> 28u);
//DTNumValue = ((DTNum >> 0x08u) & 0xFFFFFFu);
if
(
Mode
==
GUI_DISP_MODE_NORMAL
)
{
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu2_01_wenzi
,
GUI_BLENDMODE_SRC_OVER
);
/*menu*/
...
...
@@ -8042,7 +8137,7 @@ void GUI_BG_DTCCamera_Display(uint8_t Mode)
GUI_Translate_Display
(
MENU_Sprite
,
CN_Nb_28_heng
,
406u
,
262u
,
GUI_BLENDMODE_SRC_OVER
);
/*-*/
GUI_General_Digit16_Display
(
MENU_Sprite
,
8888
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
GUI_General_Digit16_Display
(
MENU_Sprite
,
Data_Value
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
}
else
{
...
...
@@ -8126,6 +8221,34 @@ void GUI_BG_MenuDTCCamera_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void
GUI_BG_DTCIntarder_Display
(
uint8_t
Mode
)
{
uint8_t
DTCNumCode
=
0u
;
uint32_t
DTNumValue
=
0u
;
uint32_t
Data_Value
=
0u
;
//DTNum = DisDTCNumber[DTCDispNum];
Data_Value
=
DisDTCNumber
[
DTCDispNum
];
swap32
(
&
Data_Value
);
Data_Value
=
(
uint32_t
)(
Data_Value
&
0xFFFFu
);
if
(
DTCNumTime
<
50
)
{
DTCNumTime
++
;
}
else
{
DTCNumTime
=
0u
;
DTCDispNum
++
;
if
(
DTCDispNum
>=
DisDTCNum
)
{
DTCDispNum
=
0u
;
}
}
//DTCNumCode = (uint8_t)(DTNum >> 28u);
//DTNumValue = ((DTNum >> 0x08u) & 0xFFFFFFu);
if
(
Mode
==
GUI_DISP_MODE_NORMAL
)
{
GUI_General_Display
(
MENU_Sprite
,
CN_User_Menu2_01_wenzi
,
GUI_BLENDMODE_SRC_OVER
);
/*menu*/
...
...
@@ -8140,7 +8263,7 @@ void GUI_BG_DTCIntarder_Display(uint8_t Mode)
GUI_Translate_Display
(
MENU_Sprite
,
CN_Nb_28_heng
,
406u
,
262u
,
GUI_BLENDMODE_SRC_OVER
);
/*-*/
GUI_General_Digit16_Display
(
MENU_Sprite
,
8888
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
GUI_General_Digit16_Display
(
MENU_Sprite
,
Data_Value
,
CN_Nb_28_0
,
4u
,
0u
,
GUIBGDTCMPosX
,
267u
,
GUI_BLENDMODE_SRC_OVER
);
}
else
{
...
...
source/Application/Graphic/Menu/Menu.h
View file @
fa2b12e1
...
...
@@ -37,11 +37,11 @@ typedef enum
/*二级菜单*/
_MN_DSP_LEVEL2_1_MENU_1
,
/* 13 发动机*/
_MN_DSP_LEVEL2_1_MENU_2
,
/* 14
变速箱AMT
*/
_MN_DSP_LEVEL2_1_MENU_3
,
/* 15
刹车EBS
*/
_MN_DSP_LEVEL2_1_MENU_4
,
/* 16
液缓
*/
_MN_DSP_LEVEL2_1_MENU_5
,
/* 17
雷达
*/
_MN_DSP_LEVEL2_1_MENU_6
,
/* 18
摄像头
*/
_MN_DSP_LEVEL2_1_MENU_2
,
/* 14
刹车EBS
*/
_MN_DSP_LEVEL2_1_MENU_3
,
/* 15
变速箱AMT
*/
_MN_DSP_LEVEL2_1_MENU_4
,
/* 16
雷达
*/
_MN_DSP_LEVEL2_1_MENU_5
,
/* 17
摄像头
*/
_MN_DSP_LEVEL2_1_MENU_6
,
/* 18
液缓
*/
_MN_DSP_LEVEL2_2_MENU_1
,
/* 19 发动机机油&滤清器*/
_MN_DSP_LEVEL2_2_MENU_2
,
/* 20 燃油滤清器*/
...
...
@@ -75,11 +75,11 @@ typedef enum
/*三级菜单*/
_MN_DSP_LEVEL3_1_MENU_1
,
/* 44 发动机*/
_MN_DSP_LEVEL3_1_MENU_2
,
/* 45
变速箱AMT
*/
_MN_DSP_LEVEL3_1_MENU_3
,
/* 46
刹车EBS
*/
_MN_DSP_LEVEL3_1_MENU_4
,
/* 47
液缓
*/
_MN_DSP_LEVEL3_1_MENU_5
,
/* 48
雷达
*/
_MN_DSP_LEVEL3_1_MENU_6
,
/* 49
摄像头
*/
_MN_DSP_LEVEL3_1_MENU_2
,
/* 45
刹车EBS
*/
_MN_DSP_LEVEL3_1_MENU_3
,
/* 46
变速箱AMT
*/
_MN_DSP_LEVEL3_1_MENU_4
,
/* 47
雷达
*/
_MN_DSP_LEVEL3_1_MENU_5
,
/* 48
摄像头
*/
_MN_DSP_LEVEL3_1_MENU_6
,
/* 49
液缓
*/
_MN_DSP_LEVEL3_2_MENU_1
,
/* 50 发动机机油&滤清器*/
_MN_DSP_LEVEL3_2_MENU_2
,
/* 51 燃油滤清器*/
...
...
@@ -144,18 +144,18 @@ typedef enum
_FAC_DSP_LEVEL1MENU_6
,
/* 99 HID自动水平初始化*/
_FAC_DSP_LEVEL1_1MENU_1
,
/* 100 发动机*/
_FAC_DSP_LEVEL1_1MENU_2
,
/* 101
变速箱AMT
*/
_FAC_DSP_LEVEL1_1MENU_3
,
/* 102
刹车EBS
*/
_FAC_DSP_LEVEL1_1MENU_4
,
/* 103
液缓
*/
_FAC_DSP_LEVEL1_1MENU_5
,
/* 104
雷达
*/
_FAC_DSP_LEVEL1_1MENU_6
,
/* 105
摄像头
*/
_FAC_DSP_LEVEL1_1MENU_2
,
/* 101
刹车EBS
*/
_FAC_DSP_LEVEL1_1MENU_3
,
/* 102
变速箱AMT
*/
_FAC_DSP_LEVEL1_1MENU_4
,
/* 103
雷达
*/
_FAC_DSP_LEVEL1_1MENU_5
,
/* 104
摄像头
*/
_FAC_DSP_LEVEL1_1MENU_6
,
/* 105
液缓
*/
_FAC_DSP_LEVEL1_2MENU_1
,
/* 106 发动机*/
_FAC_DSP_LEVEL1_2MENU_2
,
/* 107
变速箱AMT
*/
_FAC_DSP_LEVEL1_2MENU_3
,
/* 108
刹车EBS
*/
_FAC_DSP_LEVEL1_2MENU_4
,
/* 109
液缓
*/
_FAC_DSP_LEVEL1_2MENU_5
,
/* 110
雷达
*/
_FAC_DSP_LEVEL1_2MENU_6
,
/* 111
摄像头
*/
_FAC_DSP_LEVEL1_2MENU_2
,
/* 107
刹车EBS
*/
_FAC_DSP_LEVEL1_2MENU_3
,
/* 108
变速箱AMT
*/
_FAC_DSP_LEVEL1_2MENU_4
,
/* 109
雷达
*/
_FAC_DSP_LEVEL1_2MENU_5
,
/* 110
摄像头
*/
_FAC_DSP_LEVEL1_2MENU_6
,
/* 111
液缓
*/
//_FAC_DSP_LEVEL1_2MENU_1, /* 1 清除所有DTC*/
//_FAC_DSP_LEVEL1_2MENU_2, /* 1 清除所有DTC*/
...
...
@@ -167,25 +167,25 @@ typedef enum
_FAC_DSP_LEVEL1_6MENU_2
,
/* 115 HID自动标准初始化*/
_FAC_DSP_LEVEL2_1MENU_1
,
/* 116 发动机*/
_FAC_DSP_LEVEL2_1MENU_2
,
/* 117
变速箱AMT
*/
_FAC_DSP_LEVEL2_1MENU_3
,
/* 118
刹车EBS
*/
_FAC_DSP_LEVEL2_1MENU_4
,
/* 119
液缓
*/
_FAC_DSP_LEVEL2_1MENU_5
,
/* 120
雷达
*/
_FAC_DSP_LEVEL2_1MENU_6
,
/* 121
摄像头
*/
_FAC_DSP_LEVEL2_1MENU_2
,
/* 117
刹车EBS
*/
_FAC_DSP_LEVEL2_1MENU_3
,
/* 118
变速箱AMT
*/
_FAC_DSP_LEVEL2_1MENU_4
,
/* 119
雷达
*/
_FAC_DSP_LEVEL2_1MENU_5
,
/* 120
摄像头
*/
_FAC_DSP_LEVEL2_1MENU_6
,
/* 121
液缓
*/
_FAC_DSP_LEVEL2_2MENU_1
,
/* 122 是否发动机*/
_FAC_DSP_LEVEL2_2MENU_2
,
/* 123 是否
变速箱AMT
*/
_FAC_DSP_LEVEL2_2MENU_3
,
/* 124 是否
刹车EBS
*/
_FAC_DSP_LEVEL2_2MENU_4
,
/* 125 是否
液缓
*/
_FAC_DSP_LEVEL2_2MENU_5
,
/* 126 是否
雷达
*/
_FAC_DSP_LEVEL2_2MENU_6
,
/* 127 是否
摄像头
*/
_FAC_DSP_LEVEL2_2MENU_2
,
/* 123 是否
刹车EBS
*/
_FAC_DSP_LEVEL2_2MENU_3
,
/* 124 是否
变速箱AMT
*/
_FAC_DSP_LEVEL2_2MENU_4
,
/* 125 是否
雷达
*/
_FAC_DSP_LEVEL2_2MENU_5
,
/* 126 是否
摄像头
*/
_FAC_DSP_LEVEL2_2MENU_6
,
/* 127 是否
液缓
*/
_FAC_DSP_LEVEL3_2MENU_1
,
/* 128 是发动机*/
_FAC_DSP_LEVEL3_2MENU_2
,
/* 129 是
变速箱AMT
*/
_FAC_DSP_LEVEL3_2MENU_3
,
/* 130 是
刹车EBS
*/
_FAC_DSP_LEVEL3_2MENU_4
,
/* 131 是
液缓
*/
_FAC_DSP_LEVEL3_2MENU_5
,
/* 132 是
雷达
*/
_FAC_DSP_LEVEL3_2MENU_6
,
/* 133 是
摄像头
*/
_FAC_DSP_LEVEL3_2MENU_2
,
/* 129 是
刹车EBS
*/
_FAC_DSP_LEVEL3_2MENU_3
,
/* 130 是
变速箱AMT
*/
_FAC_DSP_LEVEL3_2MENU_4
,
/* 131 是
雷达
*/
_FAC_DSP_LEVEL3_2MENU_5
,
/* 132 是
摄像头
*/
_FAC_DSP_LEVEL3_2MENU_6
,
/* 133 是
液缓
*/
_FAC_DSP_LEVEL2_5MENU_1
,
/* 134 是否结束工厂模式*/
...
...
@@ -200,18 +200,18 @@ typedef enum
_DEA_DSP_LEVEL1MENU_6
,
/* 141 HID自动水平初始化*/
_DEA_DSP_LEVEL1_1MENU_1
,
/* 142 发动机*/
_DEA_DSP_LEVEL1_1MENU_2
,
/* 143
变速箱AMT
*/
_DEA_DSP_LEVEL1_1MENU_3
,
/* 144
刹车EBS
*/
_DEA_DSP_LEVEL1_1MENU_4
,
/* 145
液缓
*/
_DEA_DSP_LEVEL1_1MENU_5
,
/* 146
雷达
*/
_DEA_DSP_LEVEL1_1MENU_6
,
/* 147
摄像头
*/
_DEA_DSP_LEVEL1_1MENU_2
,
/* 143
刹车EBS
*/
_DEA_DSP_LEVEL1_1MENU_3
,
/* 144
变速箱AMT
*/
_DEA_DSP_LEVEL1_1MENU_4
,
/* 145
雷达
*/
_DEA_DSP_LEVEL1_1MENU_5
,
/* 146
摄像头
*/
_DEA_DSP_LEVEL1_1MENU_6
,
/* 147
液缓
*/
_DEA_DSP_LEVEL1_2MENU_1
,
/* 148 发动机*/
_DEA_DSP_LEVEL1_2MENU_2
,
/* 149
变速箱AMT
*/
_DEA_DSP_LEVEL1_2MENU_3
,
/* 150
刹车EBS
*/
_DEA_DSP_LEVEL1_2MENU_4
,
/* 151
液缓
*/
_DEA_DSP_LEVEL1_2MENU_5
,
/* 152
雷达
*/
_DEA_DSP_LEVEL1_2MENU_6
,
/* 153
摄像头
*/
_DEA_DSP_LEVEL1_2MENU_2
,
/* 149
刹车EBS
*/
_DEA_DSP_LEVEL1_2MENU_3
,
/* 150
变速箱AMT
*/
_DEA_DSP_LEVEL1_2MENU_4
,
/* 151
雷达
*/
_DEA_DSP_LEVEL1_2MENU_5
,
/* 152
摄像头
*/
_DEA_DSP_LEVEL1_2MENU_6
,
/* 153
液缓
*/
//_DEA_DSP_LEVEL1_2MENU_1, /* 1 清除所有DTC*/
//_DEA_DSP_LEVEL1_2MENU_2, /* 1 清除所有DTC*/
...
...
@@ -223,25 +223,25 @@ typedef enum
_DEA_DSP_LEVEL1_6MENU_2
,
/* 157 HID自动标准初始化*/
_DEA_DSP_LEVEL2_1MENU_1
,
/* 158 发动机*/
_DEA_DSP_LEVEL2_1MENU_2
,
/* 159
变速箱AMT
*/
_DEA_DSP_LEVEL2_1MENU_3
,
/* 160
刹车EBS
*/
_DEA_DSP_LEVEL2_1MENU_4
,
/* 161
液缓
*/
_DEA_DSP_LEVEL2_1MENU_5
,
/* 162
雷达
*/
_DEA_DSP_LEVEL2_1MENU_6
,
/* 163
摄像头
*/
_DEA_DSP_LEVEL2_1MENU_2
,
/* 159
刹车EBS
*/
_DEA_DSP_LEVEL2_1MENU_3
,
/* 160
变速箱AMT
*/
_DEA_DSP_LEVEL2_1MENU_4
,
/* 161
雷达
*/
_DEA_DSP_LEVEL2_1MENU_5
,
/* 162
摄像头
*/
_DEA_DSP_LEVEL2_1MENU_6
,
/* 163
液缓
*/
_DEA_DSP_LEVEL2_2MENU_1
,
/* 164 是否发动机*/
_DEA_DSP_LEVEL2_2MENU_2
,
/* 165 是否
变速箱AMT
*/
_DEA_DSP_LEVEL2_2MENU_3
,
/* 166 是否
刹车EBS
*/
_DEA_DSP_LEVEL2_2MENU_4
,
/* 167 是否
液缓
*/
_DEA_DSP_LEVEL2_2MENU_5
,
/* 168 是否
雷达
*/
_DEA_DSP_LEVEL2_2MENU_6
,
/* 169 是否
摄像头
*/
_DEA_DSP_LEVEL2_2MENU_2
,
/* 165 是否
刹车EBS
*/
_DEA_DSP_LEVEL2_2MENU_3
,
/* 166 是否
变速箱AMT
*/
_DEA_DSP_LEVEL2_2MENU_4
,
/* 167 是否
雷达
*/
_DEA_DSP_LEVEL2_2MENU_5
,
/* 168 是否
摄像头
*/
_DEA_DSP_LEVEL2_2MENU_6
,
/* 169 是否
液缓
*/
_DEA_DSP_LEVEL3_2MENU_1
,
/* 170 是发动机*/
_DEA_DSP_LEVEL3_2MENU_2
,
/* 171 是
变速箱AMT
*/
_DEA_DSP_LEVEL3_2MENU_3
,
/* 172 是
刹车EBS
*/
_DEA_DSP_LEVEL3_2MENU_4
,
/* 173 是
液缓
*/
_DEA_DSP_LEVEL3_2MENU_5
,
/* 174 是
雷达
*/
_DEA_DSP_LEVEL3_2MENU_6
,
/* 175 是
摄像头
*/
_DEA_DSP_LEVEL3_2MENU_2
,
/* 171 是
刹车EBS
*/
_DEA_DSP_LEVEL3_2MENU_3
,
/* 172 是
变速箱AMT
*/
_DEA_DSP_LEVEL3_2MENU_4
,
/* 173 是
雷达
*/
_DEA_DSP_LEVEL3_2MENU_5
,
/* 174 是
摄像头
*/
_DEA_DSP_LEVEL3_2MENU_6
,
/* 175 是
液缓
*/
_DEA_DSP_LEVEL2_5MENU_1
,
/* 176 是否结束经销商模式*/
...
...
source/Application/Graphic/Menu/Menu_user.c
View file @
fa2b12e1
...
...
@@ -2135,7 +2135,7 @@ void LevelF1_1Menu_1Do(void)
void
LevelF1_1Menu_1Exit
(
void
)
{}
/*----工厂模式----DTC显示----
SCR系统故障
*-----*/
/*----工厂模式----DTC显示----
刹车
*-----*/
void
LevelF1_1Menu_2Enter
(
void
)
{}
void
LevelF1_1Menu_2Do
(
void
)
...
...
@@ -2160,7 +2160,7 @@ void LevelF1_1Menu_3Do(void)
void
LevelF1_1Menu_3Exit
(
void
)
{}
/*----工厂模式----DTC显示----
仪表故障
*-----*/
/*----工厂模式----DTC显示----
雷达
*-----*/
void
LevelF1_1Menu_4Enter
(
void
)
{}
void
LevelF1_1Menu_4Do
(
void
)
...
...
@@ -2171,6 +2171,8 @@ void LevelF1_1Menu_4Do(void)
}
void
LevelF1_1Menu_4Exit
(
void
)
{}
/*----工厂模式----DTC显示----摄像头*-----*/
void
LevelF1_1Menu_5Enter
(
void
)
{}
void
LevelF1_1Menu_5Do
(
void
)
...
...
@@ -2182,6 +2184,7 @@ void LevelF1_1Menu_5Do(void)
void
LevelF1_1Menu_5Exit
(
void
)
{}
/*----工厂模式----DTC显示----液缓*-----*/
void
LevelF1_1Menu_6Enter
(
void
)
{}
void
LevelF1_1Menu_6Do
(
void
)
...
...
@@ -2193,8 +2196,7 @@ void LevelF1_1Menu_6Do(void)
void
LevelF1_1Menu_6Exit
(
void
)
{}
/*----工厂模式----DTC显示----发动机故障*-----*/
/*----工厂模式----DTC清除----发动机故障*-----*/
void
LevelF1_2Menu_1Enter
(
void
)
{}
void
LevelF1_2Menu_1Do
(
void
)
...
...
@@ -2206,6 +2208,7 @@ void LevelF1_2Menu_1Do(void)
void
LevelF1_2Menu_1Exit
(
void
)
{}
/*----工厂模式----DTC清除----刹车故障*-----*/
void
LevelF1_2Menu_2Enter
(
void
)
{}
void
LevelF1_2Menu_2Do
(
void
)
...
...
@@ -2216,6 +2219,7 @@ void LevelF1_2Menu_2Do(void)
void
LevelF1_2Menu_2Exit
(
void
)
{}
/*----工厂模式----DTC清除----变速箱故障*-----*/
void
LevelF1_2Menu_3Enter
(
void
)
{}
void
LevelF1_2Menu_3Do
(
void
)
...
...
@@ -2226,6 +2230,7 @@ void LevelF1_2Menu_3Do(void)
void
LevelF1_2Menu_3Exit
(
void
)
{}
/*----工厂模式----DTC清除----雷达故障*-----*/
void
LevelF1_2Menu_4Enter
(
void
)
{}
void
LevelF1_2Menu_4Do
(
void
)
...
...
@@ -2236,6 +2241,7 @@ void LevelF1_2Menu_4Do(void)
void
LevelF1_2Menu_4Exit
(
void
)
{}
/*----工厂模式----DTC清除----摄像头故障*-----*/
void
LevelF1_2Menu_5Enter
(
void
)
{}
void
LevelF1_2Menu_5Do
(
void
)
...
...
@@ -2246,6 +2252,7 @@ void LevelF1_2Menu_5Do(void)
void
LevelF1_2Menu_5Exit
(
void
)
{}
/*----工厂模式----DTC清除----液缓故障*-----*/
void
LevelF1_2Menu_6Enter
(
void
)
{}
void
LevelF1_2Menu_6Do
(
void
)
...
...
@@ -2434,41 +2441,292 @@ void LevelF2_1Menu_1Do(void)
void
LevelF2_1Menu_1Exit
(
void
)
{}
/*----工厂模式----117 刹车----*/
void
LevelF2_1Menu_2Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
1u
;
//0u;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x00u
;
canMag
.
Msg
[
5u
]
=
0x00u
;
canMag
.
Msg
[
6u
]
=
0x00u
;
canMag
.
Msg
[
7u
]
=
0x00u
;
Can_Write
(
&
canMag
);
Menu_DTC_DisTime
=
50u
;
}
void
LevelF2_1Menu_2Do
(
void
)
{}
{
uint8_t
DTCNumDis
=
0x00u
;
if
(
Menu_DTC_DisTime
!=
0x00u
)
{
Menu_DTC_DisTime
--
;
}
if
(
Menu_DTC_DisTime
==
0u
)
{
DTCNumDis
=
1u
;
}
else
{
DTCNumDis
=
0u
;
}
GUI_OftenShow_Display
();
if
(
DTCNumDis
==
1u
)
/*计时*/
{
GUI_BG_DTCBrake_Display
(
GUI_DISP_MODE_NORMAL
);
}
else
/*故障码读取中*/
{
GUI_BG_DTCReading_Display
(
GUI_DISP_MODE_NORMAL
);
}
}
void
LevelF2_1Menu_2Exit
(
void
)
{}
/*----工厂模式----118 变速箱----*/
void
LevelF2_1Menu_3Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
1u
;
//0u;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x00u
;
canMag
.
Msg
[
5u
]
=
0x00u
;
canMag
.
Msg
[
6u
]
=
0x00u
;
canMag
.
Msg
[
7u
]
=
0x00u
;
Can_Write
(
&
canMag
);
Menu_DTC_DisTime
=
50u
;
}
void
LevelF2_1Menu_3Do
(
void
)
{}
{
uint8_t
DTCNumDis
=
0x00u
;
if
(
Menu_DTC_DisTime
!=
0x00u
)
{
Menu_DTC_DisTime
--
;
}
if
(
Menu_DTC_DisTime
==
0u
)
{
DTCNumDis
=
1u
;
}
else
{
DTCNumDis
=
0u
;
}
GUI_OftenShow_Display
();
if
(
DTCNumDis
==
1u
)
/*计时*/
{
GUI_BG_DTCAMT_Display
(
GUI_DISP_MODE_NORMAL
);
}
else
/*故障码读取中*/
{
GUI_BG_DTCReading_Display
(
GUI_DISP_MODE_NORMAL
);
}
}
void
LevelF2_1Menu_3Exit
(
void
)
{}
/*----工厂模式----119 雷达----*/
void
LevelF2_1Menu_4Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
1u
;
//0u;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x00u
;
canMag
.
Msg
[
5u
]
=
0x00u
;
canMag
.
Msg
[
6u
]
=
0x00u
;
canMag
.
Msg
[
7u
]
=
0x00u
;
Can_Write
(
&
canMag
);
Menu_DTC_DisTime
=
50u
;
}
void
LevelF2_1Menu_4Do
(
void
)
{}
{
uint8_t
DTCNumDis
=
0x00u
;
if
(
Menu_DTC_DisTime
!=
0x00u
)
{
Menu_DTC_DisTime
--
;
}
if
(
Menu_DTC_DisTime
==
0u
)
{
DTCNumDis
=
1u
;
}
else
{
DTCNumDis
=
0u
;
}
GUI_OftenShow_Display
();
if
(
DTCNumDis
==
1u
)
/*计时*/
{
GUI_BG_DTCRadar_Display
(
GUI_DISP_MODE_NORMAL
);
}
else
/*故障码读取中*/
{
GUI_BG_DTCReading_Display
(
GUI_DISP_MODE_NORMAL
);
}
}
void
LevelF2_1Menu_4Exit
(
void
)
{}
/*----工厂模式----120 摄像头----*/
void
LevelF2_1Menu_5Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
1u
;
//0u;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x00u
;
canMag
.
Msg
[
5u
]
=
0x00u
;
canMag
.
Msg
[
6u
]
=
0x00u
;
canMag
.
Msg
[
7u
]
=
0x00u
;
Can_Write
(
&
canMag
);
Menu_DTC_DisTime
=
50u
;
}
void
LevelF2_1Menu_5Do
(
void
)
{}
{
uint8_t
DTCNumDis
=
0x00u
;
if
(
Menu_DTC_DisTime
!=
0x00u
)
{
Menu_DTC_DisTime
--
;
}
if
(
Menu_DTC_DisTime
==
0u
)
{
DTCNumDis
=
1u
;
}
else
{
DTCNumDis
=
0u
;
}
GUI_OftenShow_Display
();
if
(
DTCNumDis
==
1u
)
/*计时*/
{
GUI_BG_DTCCamera_Display
(
GUI_DISP_MODE_NORMAL
);
}
else
/*故障码读取中*/
{
GUI_BG_DTCReading_Display
(
GUI_DISP_MODE_NORMAL
);
}
}
void
LevelF2_1Menu_5Exit
(
void
)
{}
/*----工厂模式----121 液缓----*/
void
LevelF2_1Menu_6Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
1u
;
//0u;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x00u
;
canMag
.
Msg
[
5u
]
=
0x00u
;
canMag
.
Msg
[
6u
]
=
0x00u
;
canMag
.
Msg
[
7u
]
=
0x00u
;
Can_Write
(
&
canMag
);
Menu_DTC_DisTime
=
50u
;
}
void
LevelF2_1Menu_6Do
(
void
)
{}
{
uint8_t
DTCNumDis
=
0x00u
;
if
(
Menu_DTC_DisTime
!=
0x00u
)
{
Menu_DTC_DisTime
--
;
}
if
(
Menu_DTC_DisTime
==
0u
)
{
DTCNumDis
=
1u
;
}
else
{
DTCNumDis
=
0u
;
}
GUI_OftenShow_Display
();
if
(
DTCNumDis
==
1u
)
/*计时*/
{
GUI_BG_DTCIntarder_Display
(
GUI_DISP_MODE_NORMAL
);
}
else
/*故障码读取中*/
{
GUI_BG_DTCReading_Display
(
GUI_DISP_MODE_NORMAL
);
}
}
void
LevelF2_1Menu_6Exit
(
void
)
{}
/*----工厂模式----清除发动机----*/
void
LevelF2_2Menu_1Enter
(
void
)
{}
void
LevelF2_2Menu_1Do
(
void
)
...
...
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