Skip to content

V
VC66_7C
Commit d95cbee2 authored by hu's avatar hu
Browse files
Options

增加界面

parent 06240f90
Hide whitespace changes
Inline Side-by-side
Showing with 23143 additions and 22821 deletions
ghs/project
View file @ d95cbee2
No preview for this file type
ghs/project.hex
View file @ d95cbee2
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ d95cbee2
project .intvect 1536
project .text 312588
project .text 313836
project .rodata 410775
project .secinfo 120
project .syscall 6
project .romdata 9045
project .romdata 9037
project .ROM.ramfunc 208
project .ramfunc 208
source/Application/Graphic/GUI/GUI.c
View file @ d95cbee2
......@@ -122,6 +122,11 @@ void GUI_Display_Value_Init(void)
State_Flag.DEMO_AEBS1 = 2u;
State_Flag.DEMO_AEBS2 = 2u;
State_Flag.DEMO_AEBS3 = 2u;
State_Flag.FState_ClearOilTx = 0u;
State_Flag.FState_ClearOilRx = 1u;
State_Flag.FState_COilTimeOut = FState_COilTimeOutNum;
}
/*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group
......@@ -3302,26 +3307,23 @@ void GUI_BG_RepMenu_Display(uint8_t Mode)
* Return : None
* onther :
--------------------------------------------------------------------------*/
uint8_t HYQ_TEST_FLAG = 0u;
void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
{
uint16_t User_FDJYLQQ_Value = 0u;
uint8_t User_FDJYLQQ_FLAG = 0u;
User_FDJYLQQ_Value = HYQ_TEST;
User_FDJYLQQ_FLAG = HYQ_TEST_FLAG;
uint16_t User_Value = 0u;
uint8_t User_FLAG = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
if (User_FDJYLQQ_Value > 0u)
User_Value = User_App.User_FDJYLQQ; /*显示数据*/
User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_FDJYLQQ_Value > 999u)
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_FDJYLQQ_Value > 1000)
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
......@@ -3338,11 +3340,11 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_FDJYLQQ_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FDJYLQQ_FLAG == 1u)
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
......@@ -3350,7 +3352,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FDJYLQQ_FLAG == 3u)
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
......@@ -3372,9 +3374,54 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_2_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_22, GUI_BLENDMODE_SRC_OVER); /*menu*/
//User_Value = User_App.User_FDJYLQQ; /*显示数据*/
//User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_24, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_24, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
//else
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_26, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
//}
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
......@@ -3392,9 +3439,54 @@ void GUI_BG_RepMenu_3_2_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_3_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_2, GUI_BLENDMODE_SRC_OVER); /*menu*/
//User_Value = User_App.User_FDJYLQQ; /*显示数据*/
//User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_1, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_1, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
//else
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_3, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
//}
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_2, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_2, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
......@@ -3412,9 +3504,54 @@ void GUI_BG_RepMenu_3_3_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_4_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_4, GUI_BLENDMODE_SRC_OVER); /*menu*/
//User_Value = User_App.User_FDJYLQQ; /*显示数据*/
//User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_4, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_4, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
//else
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_6, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
//}
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_5, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_5, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
......@@ -3432,9 +3569,54 @@ void GUI_BG_RepMenu_3_4_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_6_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_14, GUI_BLENDMODE_SRC_OVER); /*menu*/
//User_Value = User_App.User_FDJYLQQ; /*显示数据*/
//User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_24, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_24, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
//else
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_26, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
//}
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
......@@ -3452,9 +3634,54 @@ void GUI_BG_RepMenu_3_6_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_7_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_6, GUI_BLENDMODE_SRC_OVER); /*menu*/
//User_Value = User_App.User_FDJYLQQ; /*显示数据*/
//User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_7, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_7, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
//else
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_9, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
//}
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_8, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_8, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
......@@ -3472,9 +3699,54 @@ void GUI_BG_RepMenu_3_7_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_8_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
//User_Value = User_App.User_FDJYLQQ; /*显示数据*/
//User_FLAG = State_Flag.User_FDJYLQQ_FLAG; /*显示状态*/
if (User_Value > 0u)
{
if (User_Value > 999u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_18, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//if (User_Value > 1000)
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_18, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
//}
//else
//{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_20, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
//}
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_19, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else
{
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_19, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if (User_FLAG == 3u)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
......
source/Application/Graphic/GUI/GUI.h
View file @ d95cbee2
......@@ -9,6 +9,8 @@
#define Language_En 0u
#define Language_Cn 1u
#define FState_COilTimeOutNum 60u /*3S*/
typedef struct
{
uint8_t FState_GZM; /*故障码*/
......@@ -55,9 +57,22 @@ typedef struct
uint8_t ENTER_RETURN;
uint8_t FState_COilTimeOut;
uint8_t Menu_Key_Static;
uint8_t User_FDJYLQQ_FLAG;
uint8_t User_RYLQQ_FLAG;
uint8_t User_BSXY_FLAG;
uint8_t User_CSQY_FLAG;
uint8_t User_KQGZJ_FLAG;
uint8_t User_DLZXY_FLAG;
uint8_t User_LT_FLAG;
uint8_t User_LHQY_FLAG;
uint8_t FState_ClearOilTx;
uint8_t FState_ClearOilRx;
uint8_t FState_COilTimeOut;
} _Display_State_Flag;
extern volatile _Display_State_Flag State_Flag;
......
source/Application/Graphic/Menu/Menu_user.c
View file @ d95cbee2
......@@ -650,7 +650,15 @@ void Level2_6Menu_2Exit(void)
/*----三级菜单----保养通知----系列子菜单*/
/*发动机机油滤清器*/
void Level3_2Menu_1Enter(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000;
State_Flag.User_FDJYLQQ_FLAG = 0;
MenuFlag.Menu_Return = 0;
}
}
void Level3_2Menu_1Do(void)
{
GUI_OftenShow_Display();
......@@ -696,18 +704,6 @@ void Level3_2Menu_4Do(void)
void Level3_2Menu_4Exit(void)
{}
/*空气干燥剂*/
void Level3_2Menu_6Enter(void)
{}
void Level3_2Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_RepMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_RepMenu_3_6_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_2Menu_6Exit(void)
{}
/*动力转向油*/
void Level3_2Menu_7Enter(void)
{}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment