Skip to content

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

更换图片FV00.03

parent 4c515d8e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23954 additions and 23900 deletions
ghs/project
View file @ 2ad59a75
No preview for this file type
ghs/project.hex
View file @ 2ad59a75
This diff is collapsed.
ghs/project.siz
View file @ 2ad59a75
project .intvect 1536
project .text 316204
project .rodata 410791
project .text 316252
project .rodata 411111
project .secinfo 120
project .syscall 6
project .romdata 9029
......
source/Application/Graphic/GUI/GUI.c
View file @ 2ad59a75
......@@ -130,7 +130,7 @@ void GUI_Display_Value_Init(void)
/*应用*/
User_App.User_Language = 1u ;
User_App.User_Company = 1u ;
User_App.User_Light = 10u ; //背光初始化
User_App.User_Light = 10u ; /*背光初始化*/
/*保养状态标识*/
if (K_Line_Set.K_Line_LID4F)
......@@ -185,9 +185,9 @@ void GUI_Display_Value_Init(void)
User_set_Num.User_LT = User_App.User_LT ;
/*用户设定*/
User_set_Num.User_Language = User_App.User_Language ;
User_set_Num.User_Company = User_App.User_Company ;
User_set_Num.User_Light = User_App.User_Light ;
User_set_Num.User_Language = User_App.User_Language;
User_set_Num.User_Company = User_App.User_Company ;
User_set_Num.User_Light = User_App.User_Light ;
User_App.User_Gsl = 0xFFu;
User_App.User_Ybl = 0xFFu;
......@@ -197,13 +197,13 @@ void GUI_Display_Value_Init(void)
User_App.User_IDLING = K_Line_Set.K_Line_LID48; /*长时间怠速*/
User_App.User_Parking = K_Line_Set.K_Line_LID49; /*辅助驻车*/
User_set_Num.User_Gsl = User_App.User_Gsl ;
User_set_Num.User_Ybl = User_App.User_Ybl ;
User_set_Num.User_Speed = User_App.User_Speed ;
User_set_Num.User_JADD = User_App.User_JADD ;
User_set_Num.User_JSUB = User_App.User_JSUB ;
User_set_Num.User_IDLING = User_App.User_IDLING ;
User_set_Num.User_Parking = User_App.User_Parking ;
User_set_Num.User_Gsl = User_App.User_Gsl ;
User_set_Num.User_Ybl = User_App.User_Ybl ;
User_set_Num.User_Speed = User_App.User_Speed ;
User_set_Num.User_JADD = User_App.User_JADD ;
User_set_Num.User_JSUB = User_App.User_JSUB ;
User_set_Num.User_IDLING = User_App.User_IDLING ;
User_set_Num.User_Parking = User_App.User_Parking ;
//MenuFlag.Sig.Menu_Flag = 0;
#if 0
......@@ -483,11 +483,11 @@ void GUI_Time_Dispaly(uint8_t Mode)
}
else if (Time_Hours > 12u)
{
GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); // PM
GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* PM */
}
else
{
GUI_General_Digit_Display(Time_Sprite, Time_Hours, Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); // AM
GUI_General_Digit_Display(Time_Sprite, Time_Hours, Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* AM */
}
}
else
......@@ -5360,8 +5360,9 @@ void GUI_BG_UserSet_SYSD_JADD_Display(uint8_t Mode)
if (User_Value != 0xFF)
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*m/s2*/
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 2u, 0u, GUI_SYSJDD_X, 251u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_Translate_Display(MENU_Sprite, Nb_15_dian, 454u, 254u, GUI_BLENDMODE_CUSTOM);/*dot*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_ms2, GUI_BLENDMODE_SRC_OVER);/*m/s2*/
}
else
{
......@@ -5395,8 +5396,9 @@ void GUI_BG_UserSet_SYSD_JSUB_Display(uint8_t Mode)
if (User_Value != 0xFF)
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*m/s2*/
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 2u, 0u, GUI_SYSJDD_X, 251u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_Translate_Display(MENU_Sprite, Nb_15_dian, 454u, 254u, GUI_BLENDMODE_CUSTOM);/*dot*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_ms2, GUI_BLENDMODE_SRC_OVER);/*m/s2*/
}
else
{
......@@ -5493,7 +5495,7 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
if (State_Flag.ENTER_RETURN == 0)
if (State_Flag.ENTER_RETURN == 0u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_10, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
......
source/Application/Graphic/GUI/GUI.h
View file @ 2ad59a75
......@@ -174,6 +174,7 @@ static const uint16_t GUI_REP_X[4] = {582u, 565u, 547u, 521u};
static const uint16_t GUI_SETREP_X[6] = {520u, 503u, 485u, 458u, 441u, 424u};
static const uint16_t GUI_SYSSET_X[4] = {520u, 503u, 485u, 468u};
static const uint16_t GUI_SYSSPEED[2] = {485u, 468u};
static const uint16_t GUI_SYSJDD_X[2] = {469u, 441u};
static const uint16_t GUIUsetSetYPos[2] = {304u, 282u};
static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
......
source/Driver/Graphic/images.c
View file @ 2ad59a75
This source diff could not be displayed because it is too large. You can view the blob instead.
source/Driver/Graphic/images.h
View file @ 2ad59a75
......@@ -76,6 +76,7 @@ enum SpriteName
Nb_15_7,
Nb_15_8,
Nb_15_9,
Nb_15_dian,
Nb_15_douhao,
Nb_15_fuhao,
Nb_15_maohao,
......@@ -384,6 +385,11 @@ enum SpriteName
CN_Alarm_stop_44_wenzi1_2,
CN_Alarm_stop_44_wenzi2_1,
CN_Alarm_stop_44_wenzi2_2,
CN_Alarm_drive_70_image,
CN_Alarm_drive_70_wenzi1,
CN_Alarm_stop_70_wenzi1_1,
CN_Alarm_stop_70_wenzi2,
CN_Alarm_stop_71_wenzi1_1,
CN_DPD_duijiliang,
CN_DPD_H,
CN_DPD_L,
......@@ -463,6 +469,7 @@ enum SpriteName
CN_ADAS_wenzi,
CN_che,
CN_che_shanshuo,
CN_che_yinying,
CN_jiao1,
CN_jiao2,
CN_jiao3,
......@@ -470,15 +477,27 @@ enum SpriteName
CN_LeftRoad,
CN_LeftRoad_1,
CN_LeftRoad_shanshuo,
CN_LeftRoad_shanshuo_1,
CN_LeftRoad_shanshuo_2,
CN_LeftRoad_yinying,
CN_RightRoad,
CN_RightRoad_1,
CN_RightRoad_shanshuo,
CN_RightRoad_shanshuo_1,
CN_RightRoad_shanshuo_2,
CN_RightRoad_yiying,
CN_Road1,
CN_Road1_shanshuo,
CN_Road1_shanshuo_1,
CN_Road1_yinying,
CN_Road2,
CN_Road2_shanshuo,
CN_Road2_shanshuo_1,
CN_Road2_yinying,
CN_Road3,
CN_Road3_shanshuo,
CN_Road3_shanshuo_1,
CN_Road3_yinying,
CN_tanhao1,
CN_tanhao2,
CN_fengexian,
......@@ -819,6 +838,7 @@ enum SpriteName
CN_User_Menu3_03_kuai,
CN_User_Menu3_03_kuang,
CN_User_Menu3_03_man,
CN_User_Menu3_03_ms2,
CN_User_Menu3_03_nian,
CN_User_Menu3_03_PM,
CN_User_Menu3_03_redge,
......
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