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
328eadc3
Commit
328eadc3
authored
Mar 16, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整故障码显示逻辑
parent
0c17d9cd
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
258 additions
and
41 deletions
+258
-41
GUI.c
source/Application/Graphic/GUI/GUI.c
+242
-29
GUI.h
source/Application/Graphic/GUI/GUI.h
+15
-12
Menu_user.c
source/Application/Graphic/Menu/Menu_user.c
+1
-0
No files found.
source/Application/Graphic/GUI/GUI.c
View file @
328eadc3
This diff is collapsed.
Click to expand it.
source/Application/Graphic/GUI/GUI.h
View file @
328eadc3
...
...
@@ -252,10 +252,13 @@ static const uint32_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu,
static
const
uint32_t
GUIGear
[
12u
]
=
{
CN_dangwei_1
,
CN_dangwei_2
,
CN_dangwei_3
,
CN_dangwei_4
,
CN_dangwei_5
,
CN_dangwei_6
,
CN_dangwei_7
,
CN_dangwei_8
,
CN_dangwei_9
,
CN_dangwei_10
,
CN_dangwei_11
,
CN_dangwei_12
};
static
const
uint32_t
GUIMETERY
[
5
]
=
{
Nb_15_2
,
Nb_15_3
,
Nb_15_4
,
Nb_15_5
,
CN_Fty_Menu2_08_A
};
static
const
uint32_t
GUIMETERYNUM
[
16
]
=
{
Nb_15_0
,
Nb_15_1
,
Nb_15_2
,
Nb_15_3
,
Nb_15_4
,
Nb_15_5
,
Nb_15_6
,
Nb_15_7
,
static
const
uint32_t
GUIMETERY
[
5
u
]
=
{
Nb_15_2
,
Nb_15_3
,
Nb_15_4
,
Nb_15_5
,
CN_Fty_Menu2_08_A
};
static
const
uint32_t
GUIMETERYNUM
[
16
u
]
=
{
Nb_15_0
,
Nb_15_1
,
Nb_15_2
,
Nb_15_3
,
Nb_15_4
,
Nb_15_5
,
Nb_15_6
,
Nb_15_7
,
Nb_15_8
,
Nb_15_9
,
CN_Fty_Menu2_08_A
,
CN_Fty_Menu2_08_B
,
CN_Fty_Menu2_08_C
,
CN_Fty_Menu2_08_D
,
CN_Fty_Menu2_08_E
,
CN_Fty_Menu2_08_F
};
static
const
uint32_t
GUIDTCNUM
[
16u
]
=
{
CN_Nb_28_0
,
CN_Nb_28_1
,
CN_Nb_28_2
,
CN_Nb_28_3
,
CN_Nb_28_4
,
CN_Nb_28_5
,
CN_Nb_28_6
,
CN_Nb_28_7
,
CN_Nb_28_8
,
CN_Nb_28_9
,
CN_Alarm_Fault_A
,
CN_Alarm_Fault_B
,
CN_Alarm_Fault_C
,
CN_Alarm_Fault_D
,
CN_Alarm_Fault_E
,
CN_Alarm_Fault_F
};
static
const
uint16_t
GUI_DISP_LEMPY
[
4
]
=
{
92u
,
158u
,
225u
,
291u
};
static
const
uint16_t
GUI_DISP_AC_TEMP
[
2
]
=
{
229u
,
216u
};
/*室外温度数字显示*/
...
...
@@ -444,8 +447,8 @@ void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2
void
GUI_BG_FacDTCClear3_Display
(
uint8_t
Mode
);
/*工厂模式清除DTC2*/
void
GUI_BG_FacDTCClear4_Display
(
uint8_t
Mode
);
/*工厂模式清除DTC2*/
void
GUI_BG_FacMeter_Display
(
uint8_t
Mode
);
/*工厂模式仪表显示*/
void
GUI_BG_FacHIDAutoInit1_Display
(
uint8_t
Mode
);
void
GUI_BG_FacHIDAutoInit2_Display
(
uint8_t
Mode
);
void
GUI_BG_FacHIDAutoInit1_Display
(
uint8_t
Mode
);
/**/
void
GUI_BG_FacHIDAutoInit2_Display
(
uint8_t
Mode
);
/**/
void
GUI_BG_FacMeterExit_Display
(
uint8_t
Mode
);
/*工厂模式是否结束工厂模式*/
void
GUI_DeaMenu_Display
(
uint8_t
Mode
);
/*经销商模式MENU*/
void
GUI_BG_DeaMenu_Display
(
uint8_t
Mode
);
/*经销商模式*/
...
...
@@ -460,8 +463,8 @@ void GUI_BG_DeaDTCClear2_Display(uint8_t Mode); /*经销商模式清除D
void
GUI_BG_DeaDTCClear3_Display
(
uint8_t
Mode
);
/*经销商模式清除DTC3*/
void
GUI_BG_DeaDTCClear4_Display
(
uint8_t
Mode
);
/*经销商模式清除DTC4*/
void
GUI_BG_DeaMeter_Display
(
uint8_t
Mode
);
/*经销商模式仪表显示*/
void
GUI_BG_DeaHIDAutoInit1_Display
(
uint8_t
Mode
);
void
GUI_BG_DeaHIDAutoInit2_Display
(
uint8_t
Mode
);
void
GUI_BG_DeaHIDAutoInit1_Display
(
uint8_t
Mode
);
/**/
void
GUI_BG_DeaHIDAutoInit2_Display
(
uint8_t
Mode
);
/**/
void
GUI_BG_DeaMeterExit_Display
(
uint8_t
Mode
);
/*经销商模式是否结束经销商模式*/
void
GUI_Display_DTC_Server
(
void
);
/**/
...
...
@@ -471,9 +474,9 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode); /*AMT故障*/
void
GUI_Display_NULL
(
uint8_t
Mode
);
/*无故障码*/
void
GUI_BG_Enter_Return_Display
(
uint8_t
Mode
);
/**/
void
GUI_Test_Display
(
uint8_t
Mode
);
void
Common_EOL_User_Server
(
void
);
void
K_LINE_EOL_Val_Server
(
void
);
void
GUI_Test_Display
(
uint8_t
Mode
);
/**/
void
Common_EOL_User_Server
(
void
);
/**/
void
K_LINE_EOL_Val_Server
(
void
);
/**/
/*-----报警--------------------------------------------------------*/
void
GUI_General_Popup
(
void
);
...
...
source/Application/Graphic/Menu/Menu_user.c
View file @
328eadc3
...
...
@@ -563,6 +563,7 @@ void Level2_1Menu_1Do(void)
if
(
DTCNumDis
==
1u
)
/*故障码轮显*/
{
GUI_Display_DTC_Server
();
//GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL);
}
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