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
300990a9
Commit
300990a9
authored
Nov 02, 2021
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加菜单界面
parent
c1c69e63
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23032 additions
and
22403 deletions
+23032
-22403
project
ghs/project
+0
-0
project.hex
ghs/project.hex
+22275
-22241
project.siz
ghs/project.siz
+3
-3
Key_user.c
source/Application/APP/Key/Key_user.c
+12
-12
GUI.c
source/Application/Graphic/GUI/GUI.c
+152
-40
GUI.h
source/Application/Graphic/GUI/GUI.h
+44
-59
Menu.h
source/Application/Graphic/Menu/Menu.h
+375
-0
Menu_user.c
source/Application/Graphic/Menu/Menu_user.c
+127
-22
DisplaySch_user.c
source/Application/Graphic/UE/DisplaySch_user.c
+8
-0
loc_graphics.h
source/Driver/Graphic/loc_graphics.h
+15
-14
loc_graphics_data.h
source/Driver/Graphic/loc_graphics_data.h
+21
-12
No files found.
ghs/project
View file @
300990a9
No preview for this file type
ghs/project.hex
View file @
300990a9
This diff is collapsed.
Click to expand it.
ghs/project.siz
View file @
300990a9
project .intvect 1536
project .text 29
2796
project .rodata 408
719
project .text 29
3660
project .rodata 408
951
project .secinfo 120
project .syscall 6
project .romdata 90
29
project .romdata 90
37
project .ROM.ramfunc 208
project .ramfunc 208
source/Application/APP/Key/Key_user.c
View file @
300990a9
...
...
@@ -230,7 +230,7 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
if
(
0
)
/*有故障码*/
{
;
//
NextMenu(_MN_DSP_LEVEL2MENU_1);
NextMenu
(
_MN_DSP_LEVEL2MENU_1
);
}
else
/*无故障码*/
{
...
...
@@ -238,17 +238,17 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
}
}
/*无论从哪里都能回去*/
//
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU))
//
{
//
if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
//
{
//
NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/
//
}
//
else
//
{
//
NextMenu(MenuFlag.Menu_Flag);
//
}
//
}
else
if
((
bCurMenuIDX
>=
_MN_DSP_LEVEL2MENU_1
)
&&
(
bCurMenuIDX
<=
_MN_DSP_RETURN_MENU
))
{
if
(
bCurMenuIDX
==
_MN_DSP_LEVEL3_4_MENU_A
)
/*胎压设置界面*/
{
NextMenu
(
_MN_DSP_LEVEL2MENU_4
);
/*menu回到用户设置界面*/
}
else
{
NextMenu
(
MenuFlag
.
Menu_Flag
);
}
}
}
}
else
...
...
source/Application/Graphic/GUI/GUI.c
View file @
300990a9
This diff is collapsed.
Click to expand it.
source/Application/Graphic/GUI/GUI.h
View file @
300990a9
...
...
@@ -4,77 +4,62 @@
#include "loc_graphics.h"
#include "images.h"
#include
"TYW_stdint.h"
#include "TYW_stdint.h"
static
const
uint32_t
GUIWedk
[
7u
]
=
{
CN_xingqiyi
,
CN_xingqier
,
CN_xingqisan
,
CN_xingqisi
,
CN_xingqiwu
,
CN_xingqiliu
,
CN_xingqiri
};
static
const
uint32_t
GUIGear
[
12u
]
=
{
CN_dangwei_01
,
CN_dangwei_02
,
CN_dangwei_03
,
CN_dangwei_04
,
CN_dangwei_05
,
CN_dangwei_06
,
CN_dangwei_07
,
CN_dangwei_08
,
CN_dangwei_09
,
CN_dangwei_10
,
CN_dangwei_11
,
CN_dangwei_12
};
static
const
uint16_t
GUI_DISP_AC_TEMP
[
2
]
=
{
229u
,
216u
};
/*室外温度数字显示*/
static
const
uint16_t
GUI_DISP_Hours
[
2
]
=
{
370
,
349
};
static
const
uint16_t
GUI_DISP_Minutes
[
2
]
=
{
428
,
406
};
static
const
uint16_t
GUI_DISP_Year
[
4
]
=
{
568
,
552
,
538
,
522
};
static
const
uint16_t
GUI_DISP_Month
[
2
]
=
{
617
,
604
};
static
const
uint16_t
GUI_DISP_Date
[
2
]
=
{
669
,
653
};
static
const
uint16_t
GUI_DISP_TRIPA
[
5
]
=
{
676
,
648
,
629
,
610
,
591
};
/*TRIP*/
static
const
uint16_t
GUI_DISP_ODO
[
7
]
=
{
676
,
657
,
638
,
619
,
600
,
581
,
562
};
/*ODO*/
static
const
uint16_t
GUI_DISP_DrivingSupport
[
3
]
=
{
481
,
459
,
436
};
/*定速巡航*/
static
const
uint16_t
GUI_DISP_OILTEMP
[
7
]
=
{
729
,
697
,
676
,
655
,
634
,
613
,
592
};
/*油温时间*/
static
const
uint32_t
GUIMenuWedk
[
7u
]
=
{
CN_Mon
,
CN_Tue
,
CN_Wed
,
CN_Thu
,
CN_Fri
,
CN_Sat
,
CN_ri
};
static
const
uint16_t
GUI_DISP_AC_TEMP
[
2
]
=
{
229u
,
216u
};
/*室外温度数字显示*/
static
const
uint16_t
GUI_DISP_Hours
[
2
]
=
{
370u
,
349u
};
static
const
uint16_t
GUI_DISP_Minutes
[
2
]
=
{
428u
,
406u
};
static
const
uint16_t
GUI_DISP_Year
[
4
]
=
{
568u
,
552u
,
538u
,
522u
};
static
const
uint16_t
GUI_DISP_Month
[
2
]
=
{
617u
,
604u
};
static
const
uint16_t
GUI_DISP_Date
[
2
]
=
{
669u
,
653u
};
static
const
uint16_t
GUI_DISP_TRIPA
[
5
]
=
{
676u
,
648u
,
629u
,
610u
,
591u
};
/*TRIP*/
static
const
uint16_t
GUI_DISP_ODO
[
7
]
=
{
676u
,
657u
,
638u
,
619u
,
600u
,
581u
,
562u
};
/*ODO*/
static
const
uint16_t
GUI_DISP_DrivingSupport
[
3
]
=
{
481u
,
459u
,
436u
};
/*定速巡航*/
static
const
uint16_t
GUI_DISP_OILTEMP
[
7
]
=
{
729u
,
697u
,
676u
,
655u
,
634u
,
613u
,
592u
};
/*油温时间*/
static
const
uint16_t
GUI_DISP_MENUHours
[
2
]
=
{
578u
,
560u
};
static
const
uint16_t
GUI_DISP_MENUMinutes
[
2
]
=
{
623u
,
605u
};
static
const
uint16_t
GUI_DISP_MENUYear
[
4
]
=
{
495u
,
477u
,
459u
,
441u
};
/*年月日*/
static
const
uint16_t
GUI_DISP_MENUMonth
[
2
]
=
{
572u
,
554u
};
static
const
uint16_t
GUI_DISP_MENUDate
[
2
]
=
{
648u
,
630u
};
static
const
uint16_t
GUI_DISP_MENUYear1
[
4
]
=
{
568u
,
552u
,
538u
,
522u
};
/*月日年*/
static
const
uint16_t
GUI_DISP_MENUMonth1
[
2
]
=
{
617u
,
604u
};
static
const
uint16_t
GUI_DISP_MENUDate1
[
2
]
=
{
669u
,
653u
};
extern
void
GUI_Display_KL15_ON_Init
(
void
);
extern
void
GUI_Display_KL15_OFF_Init
(
void
);
extern
void
GUI_Display_background
(
void
);
/*刷底图*/
extern
void
GUI_OftenShow_Display
(
void
);
/*常显界面*/
extern
void
GUI_OftenShow_Display
(
void
);
/*常显界面*/
extern
void
GUI_Dynamic_DIsplay
(
void
);
void
GUI_AC_Temp_Dispaly
(
uint8_t
Mode
);
/*室外温度显示*/
void
GUI_Time_Dispaly
(
uint8_t
Mode
);
/*时间显示*/
void
GUI_Data_Dispaly
(
uint8_t
Mode
);
/*日历显示*/
void
GUI_TFTTelltales_Display
(
uint8_t
Mode
);
/*TFT指示灯*/
void
GUI_WetGas_Dispaly
(
uint8_t
Mode
);
/*wet气压*/
void
GUI_AdBlue_Dispaly
(
uint8_t
Mode
);
/**/
void
Gui_TRIPA_Display
(
uint8_t
Mode
);
void
Gui_TRIPB_Display
(
uint8_t
Mode
);
void
Gui_ODO_Display
(
uint8_t
Mode
);
void
Gui_ADAS_Display
(
uint8_t
Mode
);
void
Gui_DrivingSupport_Display
(
uint8_t
Mode
);
/*定速巡航*/
void
Gui_Gear_Display
(
uint8_t
Mode
);
/*挡位*/
void
GUI_AVG_FuelSpeed_Display
(
uint8_t
Mode
);
/*平均车速,平均油耗*/
void
GUI_AC_Temp_Dispaly
(
uint8_t
Mode
);
/*室外温度显示*/
void
GUI_Time_Dispaly
(
uint8_t
Mode
);
/*时间显示*/
void
GUI_Data_Dispaly
(
uint8_t
Mode
);
/*日历显示*/
void
GUI_TFTTelltales_Display
(
uint8_t
Mode
);
/*TFT指示灯*/
void
GUI_WetGas_Dispaly
(
uint8_t
Mode
);
/*wet气压*/
void
GUI_AdBlue_Dispaly
(
uint8_t
Mode
);
/**/
void
Gui_TRIPA_Display
(
uint8_t
Mode
);
/*TRIPA*/
void
Gui_TRIPB_Display
(
uint8_t
Mode
);
/*TRIPB*/
void
Gui_ODO_Display
(
uint8_t
Mode
);
/*ODO*/
void
Gui_ADAS_Display
(
uint8_t
Mode
);
/*ADAS*/
void
Gui_DrivingSupport_Display
(
uint8_t
Mode
);
/*定速巡航*/
void
Gui_Gear_Display
(
uint8_t
Mode
);
/*挡位*/
void
GUI_AVG_FuelSpeed_Display
(
uint8_t
Mode
);
/*平均车速,平均油耗*/
void
GUI_Drive_Info_Avg_Speed_Display
(
uint8_t
Valid
,
uint16_t
Speed
);
/*平均车速*/
void
GUI_Drive_Info_Avg_Fuel_Display
(
uint8_t
Valid
,
uint16_t
Fuel
);
/*平均油耗*/
void
GUI_Battery_Display_Display
(
uint8_t
Mode
);
/*电池电量*/
void
GUI_DPD_Display_Display
(
uint8_t
Mode
);
/*DPD*/
void
GUI_Time_OilTemp_Display
(
uint8_t
Mode
);
/*转速时间-油温*/
void
GUI_Time_OilTemp_OFF_Display
(
uint8_t
Mode
);
void
GUI_Year_Month_Data_Display
(
uint8_t
Mode
);
void
GUI_Drive_Info_Avg_Fuel_Display
(
uint8_t
Valid
,
uint16_t
Fuel
);
/*平均油耗*/
void
GUI_Battery_Display_Display
(
uint8_t
Mode
);
/*电池电量*/
void
GUI_DPD_Display_Display
(
uint8_t
Mode
);
/*DPD*/
void
GUI_Time_OilTemp_Display
(
uint8_t
Mode
);
/*转速时间-油温*/
void
GUI_Time_OilTemp_OFF_Display
(
uint8_t
Mode
);
/*OFF 转速时间-油温*/
void
GUI_Year_Month_Data_Display
(
uint8_t
Mode
);
/*年月日*/
void
GUI_block_NULL_Display
(
uint8_t
Mode
);
/**/
void
GUI_BG_Menu_Display
(
uint8_t
Mode
);
/*菜单项*/
void
GUI_Test_Dispaly
(
uint8_t
Mode
);
void
GUI_Test_Dispaly
(
uint8_t
Mode
);
#endif
source/Application/Graphic/Menu/Menu.h
View file @
300990a9
This diff is collapsed.
Click to expand it.
source/Application/Graphic/Menu/Menu_user.c
View file @
300990a9
...
...
@@ -26,20 +26,19 @@ const _MenuOptTab MenuOptTab[] =
/* 3*/
{
_MN_DSP_LEVEL2MENU_2
,
_MN_DSP_LEVEL1MENU_3
,
_MN_DSP_LEVEL1MENU_5
,
_MN_IDX_NULL
,
Level1Menu_4Enter
,
Level1Menu_4Do
,
Level1Menu_4Exit
},
/* _MN_DSP_LEVEL1MENU_4 */
/* 4*/
{
_MN_DSP_LEVEL2MENU_2
,
_MN_DSP_LEVEL1MENU_4
,
_MN_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
Level1Menu_5Enter
,
Level1Menu_5Do
,
Level1Menu_5Exit
},
/* _MN_DSP_LEVEL1MENU_5 */
/* 5*/
{
_MN_DSP_LEVEL2MENU_2
,
_MN_DSP_LEVEL1MENU_5
,
_MN_DSP_LEVEL1MENU_1
,
_MN_IDX_NULL
,
Level1Menu_6Enter
,
Level1Menu_6Do
,
Level1Menu_6Exit
},
/* _MN_DSP_LEVEL1MENU_6 */
/* 6*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL0
,
Level1Menu_7Enter
,
Level1Menu_7Do
,
Level1Menu_7Exit
},
/* _MN_DSP_LEVEL1MENU_7 */
/* 7*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelPopup_Enter
,
LevelPopup_Do
,
LevelPopup_Exit
},
/* _MN_DSP_LEVEPOPUP */
//
//Ò»¼¶²Ëµ¥
///* 6*/{ _MN_DSP_LEVEL2_1_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_2, _MN_IDX_NULL, Level2Menu_1Enter, Level2Menu_1Do, Level2Menu_1Exit}, // _MN_DSP_LEVEL2MENU_1
///* 7*/{ _MN_DSP_LEVEL2_2_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_3, _MN_IDX_NULL, Level2Menu_2Enter, Level2Menu_2Do, Level2Menu_2Exit}, // _MN_DSP_LEVEL2MENU_2
///* 8*/{ _MN_DSP_LEVEL2_3_MENU_1, _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, Level2Menu_3Enter, Level2Menu_3Do, Level2Menu_3Exit}, // _MN_DSP_LEVEL2MENU_3
///* 9*/{ _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2MENU_3, _MN_DSP_LEVEL2MENU_7, _MN_IDX_NULL, Level2Menu_4Enter, Level2Menu_4Do, Level2Menu_4Exit}, // _MN_DSP_LEVEL2MENU_4
///*10*/{ _MN_DSP_LEVEL2_7_MENU_1, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_7Enter, Level2Menu_7Do, Level2Menu_7Exit}, // _MN_DSP_LEVEL2MENU_7 //̥ѹÏÔʾ
///*11*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_7, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_5Enter, Level2Menu_5Do, Level2Menu_5Exit}, // _MN_DSP_LEVEL2MENU_5
///*12*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_6Enter, Level2Menu_6Do, Level2Menu_6Exit}, // _MN_DSP_LEVEL2MENU_6
//
//¶þ¼¶²Ëµ¥
///*13*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_1Enter, Level2_1Menu_1Do, Level2_1Menu_1Exit}, // _MN_DSP_LEVEL2_1_MENU_1
/* 6*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
Level1Menu_7Enter
,
Level1Menu_7Do
,
Level1Menu_7Exit
},
/* _MN_DSP_LEVEL1MENU_7 */
/* 7*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelPopup_Enter
,
LevelPopup_Do
,
LevelPopup_Exit
},
/* _MN_DSP_LEVEPOPUP */
/*一级菜单 */
/* 6*/
{
_MN_DSP_LEVEL2_1_MENU_1
,
_MN_IDX_NULL
,
_MN_DSP_LEVEL2MENU_2
,
_MN_IDX_NULL
,
Level2Menu_1Enter
,
Level2Menu_1Do
,
Level2Menu_1Exit
},
/* _MN_DSP_LEVEL2MENU_1 */
/* 7*/
{
_MN_DSP_LEVEL2_2_MENU_1
,
_MN_IDX_NULL
,
_MN_DSP_LEVEL2MENU_3
,
_MN_IDX_NULL
,
Level2Menu_2Enter
,
Level2Menu_2Do
,
Level2Menu_2Exit
},
/* _MN_DSP_LEVEL2MENU_2 */
/* 8*/
{
_MN_DSP_LEVEL2_3_MENU_1
,
_MN_DSP_LEVEL2MENU_2
,
_MN_DSP_LEVEL2MENU_4
,
_MN_IDX_NULL
,
Level2Menu_3Enter
,
Level2Menu_3Do
,
Level2Menu_3Exit
},
/* _MN_DSP_LEVEL2MENU_3 */
/* 9*/
{
_MN_DSP_LEVEL2_4_MENU_1
,
_MN_DSP_LEVEL2MENU_3
,
_MN_DSP_LEVEL2MENU_7
,
_MN_IDX_NULL
,
Level2Menu_4Enter
,
Level2Menu_4Do
,
Level2Menu_4Exit
},
/* _MN_DSP_LEVEL2MENU_4 */
/*10*/
{
_MN_DSP_LEVEL2_7_MENU_1
,
_MN_DSP_LEVEL2MENU_4
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
Level2Menu_7Enter
,
Level2Menu_7Do
,
Level2Menu_7Exit
},
/* _MN_DSP_LEVEL2MENU_7 */
/*11*/
{
_MN_IDX_NULL
,
_MN_DSP_LEVEL2MENU_7
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
Level2Menu_5Enter
,
Level2Menu_5Do
,
Level2Menu_5Exit
},
/* _MN_DSP_LEVEL2MENU_5 */
/*12*/
{
_MN_IDX_NULL
,
_MN_DSP_LEVEL2MENU_5
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
Level2Menu_6Enter
,
Level2Menu_6Do
,
Level2Menu_6Exit
},
/* _MN_DSP_LEVEL2MENU_6 */
/*二级菜单 */
/*13*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_DSP_LEVEL2MENU_1
,
Level2_1Menu_1Enter
,
Level2_1Menu_1Do
,
Level2_1Menu_1Exit
},
// _MN_DSP_LEVEL2_1_MENU_1
/*14*/
//{ _MN_IDX_NULL, _MN_DSP_LEVEL2_1_MENU_1, _MN_DSP_LEVEL2_1_MENU_3, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_2Enter, Level2_1Menu_2Do, Level2_1Menu_2Exit}, // _MN_DSP_LEVEL2_1_MENU_2
/*15*/
//{ _MN_IDX_NULL, _MN_DSP_LEVEL2_1_MENU_2, _MN_DSP_LEVEL2_1_MENU_4, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_3Enter, Level2_1Menu_3Do, Level2_1Menu_3Exit}, // _MN_DSP_LEVEL2_1_MENU_3
/*16*/
//{ _MN_IDX_NULL, _MN_DSP_LEVEL2_1_MENU_3, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_4Enter, Level2_1Menu_4Do, Level2_1Menu_4Exit}, // _MN_DSP_LEVEL2_1_MENU_4
...
...
@@ -156,7 +155,7 @@ void MenuInit(void)
if
(
bCurMenuIDX
>=
_MN_DSP_LEVEL2MENU_1
)
{
//bCurMenuIDX = MenuFlag.Si
g.Menu_Flag; /*记录上次位置*/
bCurMenuIDX
=
MenuFla
g
.
Menu_Flag
;
/*记录上次位置*/
bNextMenuIDX
=
bCurMenuIDX
;
}
else
...
...
@@ -275,12 +274,12 @@ void Level1Menu_5Exit(void)
/*主界面6 空白*/
void
Level1Menu_6Enter
(
void
)
{
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
}
void
Level1Menu_6Do
(
void
)
{
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
GUI_block_NULL_Display
(
GUI_DISP_MODE_NORMAL
);
}
void
Level1Menu_6Exit
(
void
)
{}
...
...
@@ -288,11 +287,11 @@ void Level1Menu_6Exit(void)
/*主界面7 亮度调节*/
void
Level1Menu_7Enter
(
void
)
{
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
}
void
Level1Menu_7Do
(
void
)
{
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
}
void
Level1Menu_7Exit
(
void
)
{}
...
...
@@ -300,15 +299,121 @@ void Level1Menu_7Exit(void)
/*主界面 报警界面*/
void
LevelPopup_Enter
(
void
)
{
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
}
void
LevelPopup_Do
(
void
)
{
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
}
void
LevelPopup_Exit
(
void
)
{}
/*----MENU----*/
/*二级菜单 故障码*/
void
Level2Menu_1Enter
(
void
)
{
}
void
Level2Menu_1Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 1);
//GUI_BG_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_1Exit
(
void
)
{}
/*二级菜单 维修通知*/
void
Level2Menu_2Enter
(
void
)
{
}
void
Level2Menu_2Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 2);
//GUI_BG_Menu2_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_2Exit
(
void
)
{}
/*二级菜单 维修通知设定*/
void
Level2Menu_3Enter
(
void
)
{
}
void
Level2Menu_3Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 3);
//GUI_BG_Menu3_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_3Exit
(
void
)
{}
/*二级菜单 用户设定*/
void
Level2Menu_4Enter
(
void
)
{
}
void
Level2Menu_4Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 4);
//GUI_BG_Menu4_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_4Exit
(
void
)
{}
/*二级界面 胎压显示*/
void
Level2Menu_7Enter
(
void
)
{
}
void
Level2Menu_7Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 5);
//GUI_BG_Menu7_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_7Exit
(
void
)
{}
/*二级界面 ECO状态显示*/
void
Level2Menu_5Enter
(
void
)
{
}
void
Level2Menu_5Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 6);
//GUI_BG_Menu5_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_5Exit
(
void
)
{}
/*二级界面 系统演示模式*/
void
Level2Menu_6Enter
(
void
)
{
}
void
Level2Menu_6Do
(
void
)
{
GUI_BG_Menu_Display
(
GUI_DISP_MODE_NORMAL
);
//GUI_BG_Menu_Flag_Display(0, 6);
//GUI_BG_Menu6_Display(GUI_DISP_MODE_NORMAL);
}
void
Level2Menu_6Exit
(
void
)
{}
/*----故障代码----子菜单系列*/
/*发动机故障*/
void
Level2_1Menu_1Enter
(
void
)
{
}
void
Level2_1Menu_1Do
(
void
)
{
//GUI_BG_Error_Display(GUI_DISP_MODE_NORMAL);
////GUI_BG_Menu_Flag_Display(0,1);
//if (1)
// GUI_BG_Errot1_Display(0);
//if (0)
// GUI_BG_Errot2_Display(0);
//if (0)
// GUI_BG_Errot3_Display(0);
//if (0)
// GUI_BG_Errot4_Display(0);
}
void
Level2_1Menu_1Exit
(
void
)
{}
...
...
source/Application/Graphic/UE/DisplaySch_user.c
View file @
300990a9
...
...
@@ -208,6 +208,14 @@ void GUI_DisplayServices(void)
}
else
{
if
(
bCurMenuIDX
>
_MN_DSP_LEVEPOPUP
)
{
loc_Del_Sprite
(
ADAS_Sprite
,
Gear_Sprite
);
}
else
{
loc_Del_Sprite
(
MENU_Sprite
,
MENU_Sprite
);
}
MenuManage
();
//BG_display_flag = 0;
}
...
...
source/Driver/Graphic/loc_graphics.h
View file @
300990a9
...
...
@@ -27,18 +27,19 @@ typedef struct
typedef
enum
{
WET_Sprite
,
//区域1 - 量表显示 - WET
AdBlue_Sprite
,
//区域1 - 量表显示 - AdBlue
TRIP_Sprite
,
//区域2 - TRIP显示
ODO_Sprite
,
//区域2 - ODO显示
WarningLight_Sprite
,
//区域3 - 警告灯显示
ADAS_Sprite
,
//区域4 - ADAS显示
MultiPurpose_Sprite
,
//区域5 - 多目的性显示区域
Cruise_Sprite
,
//区域6 - 巡航显示
Gear_Sprite
,
//区域7 - 档位显示
Temp_Sprite
,
//区域8 - 温度显示
Time_Sprite
,
//区域8 - 时间显示
Calendar_Sprite
,
//区域8 - 日历显示
WET_Sprite
,
/*区域1 - 量表显示 - WET*/
AdBlue_Sprite
,
/*区域1 - 量表显示 - AdBlue*/
TRIP_Sprite
,
/*区域2 - TRIP显示*/
ODO_Sprite
,
/*区域2 - ODO显示*/
WarningLight_Sprite
,
/*区域3 - 警告灯显示*/
ADAS_Sprite
,
/*区域4 - ADAS显示*/
MultiPurpose_Sprite
,
/*区域5 - 多目的性显示区域*/
Cruise_Sprite
,
/*区域6 - 巡航显示*/
Gear_Sprite
,
/*区域7 - 档位显示*/
Temp_Sprite
,
/*区域8 - 温度显示*/
Time_Sprite
,
/*区域8 - 时间显示*/
Calendar_Sprite
,
/*区域8 - 日历显示*/
MENU_Sprite
,
/*菜单区域*/
Max_Sprite
,
}
SpriteName_t
;
...
...
@@ -82,7 +83,7 @@ typedef struct
uint16_t
u16LocWinWidth
;
uint16_t
u16LocWinHeight
;
uint16_t
u16LocWinPitch
;
uint8_t
u8ScreenRefrsh
;
/
/单位Unit = 10ms
uint8_t
u8ScreenRefrsh
;
/
*单位Unit = 10ms*/
uint8_t
u8NumOfMainScreenSprite
;
uint8_t
u8NumofAllSprite
;
uint16_t
u16NumofImage
;
...
...
@@ -94,7 +95,7 @@ r_Error_t loc_RenderTexture_Normal(SpriteName_t SpriteID, LogicLayerAttr_t locPa
r_Error_t
loc_Unicode_Normal
(
SpriteName_t
SpriteID
,
LogicLayerAttr_t
locParam
,
uint16_t
Unicode
[],
uint8_t
Length
);
void
loc_Disable_Window_App
(
void
);
void
loc_Enable_Window_App
(
void
);
void
loc_Display_Service
(
void
);
/
/要求10ms任务调用
void
loc_Display_Service
(
void
);
/
*要求10ms任务调用*/
void
loc_power_off
(
void
);
void
loc_memset_LogicLayerAttr
(
LogicLayerAttr_t
*
locParam
);
void
loc_Del_Sprite
(
SpriteName_t
DelStartID
,
SpriteName_t
DelEndID
);
...
...
source/Driver/Graphic/loc_graphics_data.h
View file @
300990a9
...
...
@@ -108,20 +108,29 @@ uint8_t CalendarUpdate = 0u;
uint8_t
CalendarEn
=
0u
;
LogicLayerAttr_t
CalendarLogicLayerAttr
[
MAX_CALENDAR_SUP_LAYER
];
/**/
#define MAX_MENU_SUP_LAYER 20
MultiBufferSprite_t
MENUSpriteBuf
;
uint8_t
MENUIndex
=
0u
;
uint8_t
MENUUpdate
=
0u
;
uint8_t
MENUEn
=
0u
;
LogicLayerAttr_t
MENULogicLayerAttr
[
MAX_MENU_SUP_LAYER
];
static
const
SpritesHandler_t
SpriteHandler
[
Max_Sprite
]
=
{
{
WET_Sprite
,
{
38
,
364
,
326
,
60
,
1
},
TARGET_SDRAM
,
&
WETSpriteBuf
,
&
WETIndex
,
WETLogicLayerAttr
,
MAX_WET_SUP_LAYER
,
&
WETUpdate
,
&
WETEn
,
GUI_DisplayServices
},
{
AdBlue_Sprite
,
{
38
,
428
,
326
,
48
,
1
},
TARGET_SDRAM
,
&
AdBlueSpriteBuf
,
&
AdBlueIndex
,
AdBlueLogicLayerAttr
,
MAX_ADBLUE_SUP_LAYER
,
&
AdBlueUpdate
,
&
AdBlueEn
,
R_NULL
},
{
TRIP_Sprite
,
{
438
,
374
,
322
,
48
,
1
},
TARGET_SDRAM
,
&
TRIPSpriteBuf
,
&
TRIPIndex
,
TRIPLogicLayerAttr
,
MAX_TRIP_SUP_LAYER
,
&
TRIPUpdate
,
&
TRIPEn
,
R_NULL
},
{
ODO_Sprite
,
{
438
,
424
,
324
,
42
,
1
},
TARGET_SDRAM
,
&
ODOSpriteBuf
,
&
ODOIndex
,
ODOLogicLayerAttr
,
MAX_ODO_SUP_LAYER
,
&
ODOUpdate
,
&
ODOEn
,
R_NULL
},
{
WarningLight_Sprite
,
{
8
,
88
,
82
,
264
,
1
},
TARGET_SDRAM
,
&
WarningLightSpriteBuf
,
&
WarningLightIndex
,
WarningLightLogicLayerAttr
,
MAX_WARNINGLIGHT_SUP_LAYER
,
&
WarningLightUpdate
,
&
WarningLightEn
,
R_NULL
},
{
ADAS_Sprite
,
{
112
,
94
,
254
,
260
,
1
},
TARGET_SDRAM
,
&
ADASSpriteBuf
,
&
ADASIndex
,
ADASLogicLayerAttr
,
MAX_ADAS_SUP_LAYER
,
&
ADASUpdate
,
&
ADASEn
,
R_NULL
},
{
MultiPurpose_Sprite
,
{
382
,
182
,
410
,
170
,
1
},
TARGET_SDRAM
,
&
MultiPurposeSpriteBuf
,
&
MultiPurposeIndex
,
MultiPurposeLogicLayerAttr
,
MAX_MULTIPURPOSE_SUP_LAYER
,
&
MultiPurposeUpdate
,
&
MultiPurposeEn
,
R_NULL
},
{
Cruise_Sprite
,
{
382
,
84
,
230
,
92
,
1
},
TARGET_SDRAM
,
&
CruiseSpriteBuf
,
&
CruiseIndex
,
CruiseLogicLayerAttr
,
MAX_CRUISE_SUP_LAYER
,
&
CruiseUpdate
,
&
CruiseEn
,
R_NULL
},
{
Gear_Sprite
,
{
622
,
86
,
170
,
94
,
1
},
TARGET_SDRAM
,
&
GearSpriteBuf
,
&
GearIndex
,
GearLogicLayerAttr
,
MAX_GEAR_SUP_LAYER
,
&
GearUpdate
,
&
GearEn
,
R_NULL
},
{
Temp_Sprite
,
{
26
,
12
,
258
,
70
,
1
},
TARGET_SDRAM
,
&
TempSpriteBuf
,
&
TempIndex
,
TempLogicLayerAttr
,
MAX_TEMP_SUP_LAYER
,
&
TempUpdate
,
&
TempEn
,
R_NULL
},
{
Time_Sprite
,
{
330
,
14
,
140
,
66
,
1
},
TARGET_SDRAM
,
&
TimeSpriteBuf
,
&
TimeIndex
,
TimeLogicLayerAttr
,
MAX_TIME_SUP_LAYER
,
&
TimeUpdate
,
&
TimeEn
,
R_NULL
},
{
Calendar_Sprite
,
{
508
,
16
,
284
,
64
,
1
},
TARGET_SDRAM
,
&
CalendarSpriteBuf
,
&
CalendarIndex
,
CalendarLogicLayerAttr
,
MAX_CALENDAR_SUP_LAYER
,
&
CalendarUpdate
,
&
CalendarEn
,
R_NULL
},
{
WET_Sprite
,
{
38u
,
364u
,
326u
,
60u
,
1u
},
TARGET_SDRAM
,
&
WETSpriteBuf
,
&
WETIndex
,
WETLogicLayerAttr
,
MAX_WET_SUP_LAYER
,
&
WETUpdate
,
&
WETEn
,
GUI_DisplayServices
},
{
AdBlue_Sprite
,
{
38u
,
428u
,
326u
,
48u
,
1u
},
TARGET_SDRAM
,
&
AdBlueSpriteBuf
,
&
AdBlueIndex
,
AdBlueLogicLayerAttr
,
MAX_ADBLUE_SUP_LAYER
,
&
AdBlueUpdate
,
&
AdBlueEn
,
R_NULL
},
{
TRIP_Sprite
,
{
438u
,
374u
,
322u
,
48u
,
1u
},
TARGET_SDRAM
,
&
TRIPSpriteBuf
,
&
TRIPIndex
,
TRIPLogicLayerAttr
,
MAX_TRIP_SUP_LAYER
,
&
TRIPUpdate
,
&
TRIPEn
,
R_NULL
},
{
ODO_Sprite
,
{
438u
,
424u
,
324u
,
42u
,
1u
},
TARGET_SDRAM
,
&
ODOSpriteBuf
,
&
ODOIndex
,
ODOLogicLayerAttr
,
MAX_ODO_SUP_LAYER
,
&
ODOUpdate
,
&
ODOEn
,
R_NULL
},
{
WarningLight_Sprite
,
{
8u
,
88u
,
82u
,
264u
,
1u
},
TARGET_SDRAM
,
&
WarningLightSpriteBuf
,
&
WarningLightIndex
,
WarningLightLogicLayerAttr
,
MAX_WARNINGLIGHT_SUP_LAYER
,
&
WarningLightUpdate
,
&
WarningLightEn
,
R_NULL
},
{
ADAS_Sprite
,
{
112u
,
94u
,
254u
,
260u
,
1u
},
TARGET_SDRAM
,
&
ADASSpriteBuf
,
&
ADASIndex
,
ADASLogicLayerAttr
,
MAX_ADAS_SUP_LAYER
,
&
ADASUpdate
,
&
ADASEn
,
R_NULL
},
{
MultiPurpose_Sprite
,
{
382u
,
182u
,
410u
,
170u
,
1u
},
TARGET_SDRAM
,
&
MultiPurposeSpriteBuf
,
&
MultiPurposeIndex
,
MultiPurposeLogicLayerAttr
,
MAX_MULTIPURPOSE_SUP_LAYER
,
&
MultiPurposeUpdate
,
&
MultiPurposeEn
,
R_NULL
},
{
Cruise_Sprite
,
{
382u
,
84u
,
230u
,
92u
,
1u
},
TARGET_SDRAM
,
&
CruiseSpriteBuf
,
&
CruiseIndex
,
CruiseLogicLayerAttr
,
MAX_CRUISE_SUP_LAYER
,
&
CruiseUpdate
,
&
CruiseEn
,
R_NULL
},
{
Gear_Sprite
,
{
622u
,
86u
,
170u
,
94u
,
1u
},
TARGET_SDRAM
,
&
GearSpriteBuf
,
&
GearIndex
,
GearLogicLayerAttr
,
MAX_GEAR_SUP_LAYER
,
&
GearUpdate
,
&
GearEn
,
R_NULL
},
{
Temp_Sprite
,
{
26u
,
12u
,
258u
,
70u
,
1u
},
TARGET_SDRAM
,
&
TempSpriteBuf
,
&
TempIndex
,
TempLogicLayerAttr
,
MAX_TEMP_SUP_LAYER
,
&
TempUpdate
,
&
TempEn
,
R_NULL
},
{
Time_Sprite
,
{
330u
,
14u
,
140u
,
66u
,
1u
},
TARGET_SDRAM
,
&
TimeSpriteBuf
,
&
TimeIndex
,
TimeLogicLayerAttr
,
MAX_TIME_SUP_LAYER
,
&
TimeUpdate
,
&
TimeEn
,
R_NULL
},
{
Calendar_Sprite
,
{
508u
,
16u
,
284u
,
64u
,
1u
},
TARGET_SDRAM
,
&
CalendarSpriteBuf
,
&
CalendarIndex
,
CalendarLogicLayerAttr
,
MAX_CALENDAR_SUP_LAYER
,
&
CalendarUpdate
,
&
CalendarEn
,
R_NULL
},
{
MENU_Sprite
,
{
100u
,
82u
,
694u
,
278u
,
1u
},
TARGET_SDRAM
,
&
MENUSpriteBuf
,
&
MENUIndex
,
MENULogicLayerAttr
,
MAX_MENU_SUP_LAYER
,
&
MENUUpdate
,
&
MENUEn
,
R_NULL
},
};
/*AutoCreateEnd*/
...
...
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