Skip to content

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

調整界面顯示

parent 1c04291e
Hide whitespace changes
Inline Side-by-side
Showing with 23086 additions and 22838 deletions
ghs/project
View file @ da37d8ec
No preview for this file type
ghs/project.hex
View file @ da37d8ec
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ da37d8ec
project .intvect 1536
project .text 313836
project .text 314828
project .rodata 410775
project .secinfo 120
project .syscall 6
......
source/Application/APP/Data_AirPressure/Data_AirPressure.c
View file @ da37d8ec
......@@ -265,11 +265,6 @@ void AirPressure_AdcData_Filter(void)
u8PriValid = RTE_Read_SECONDARY_AIR_Valid();
u8SecValid = RTE_Read_PRIMARY_AIR_Valid();
}
else /*配置无效时*/
{
u8PriValid = RTE_Read_PRIMARY_AIR_Valid();
u8SecValid = RTE_Read_SECONDARY_AIR_Valid();
}
if (u8PriValid)
{
......
source/Application/APP/GaugesMode/GaugesInterface.c
View file @ da37d8ec
......@@ -49,31 +49,12 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
/*指示类型*/ /*表头1 表头2 表头3 表头4*/ /*表头5*/ /*表头6*/ /*表头7*/
static const uint8_t GaugesIndicatType[GaugesTotal] = {LEDOtherType, LEDOtherType, LEDTempType, LEDGasType, LEDGasType, LEDGasType, LEDOtherType}; /*初始化表头显示类型，例如水温，气压*/
/*每个表头包含的参数个数*/ /*表头1 表头2 表头3 表头4*/
static const uint8_t GaugesParaNum[GaugesTotal] = {12, 6, 13, 19, 19, 19, 15};
/*每个表头IGON后开始走动时间*/ /*表头1 表头2 表头3 表头4 表头5 表头6*/
static const uint16_t GaugesStarMoveTime[GaugesTotal] =
{
0,
0,
0,
0,
0,
0,
0,
}; /*0是上电就开始走动，其他参数是ms*/
/*每个表头IGON后开始走动时间*/ /*表头1 表头2 表头3 表头4 表头5 表头6*/
static const uint16_t GaugesStarMoveTime[GaugesTotal] = {3000, 3000, 3000, 3000, 3000, 0, 0,}; /*0是上电就开始走动，其他参数是ms*/
/*每个表头IGON后是否自检*/ /*表头1 表头2 表头3 表头4 表头5 表头6*/
static const uint16_t GaugesTest[GaugesTotal] =
{
1,
1,
1,
1,
1,
0,
0,
}; /*1是自检，0不自检*/
static const uint16_t GaugesTest[GaugesTotal] = {1, 1, 1, 1, 1, 0, 0,}; /*1是自检，0不自检*/
/*每个表头自检走动每格时间*/
const uint16_t SeftTest_Gauges_Times[GaugesTotal] = {1500 / (30 + 1), 1500 / (27 + 1), 1500 / (12 + 1), 1500 / (18 + 1), 1500 / (18 + 1), 0, 0};
uint16_t RealDataIn[GaugesTotal];
......
source/Application/APP/Key/Key_user.c
View file @ da37d8ec
......@@ -75,43 +75,140 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
/*保养通知设定 更换机油&机油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_1)
{
if (User_set_Num.User_FDJYLQQ == (uint32_t)K_Line_Set.K_Line_LID4F * 1000 )
User_set_Num.User_FDJYLQQ = 0 ;
if (User_set_Num.User_FDJYLQQ == (uint32_t)K_Line_Set.K_Line_LID4F * 1000u)
User_set_Num.User_FDJYLQQ = 0u ;
}
/*保养通知设定 更换燃油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_2)
{
if (User_set_Num.User_RYLQQ == (uint32_t)K_Line_User_RYLQQ * 1000 )
User_set_Num.User_RYLQQ = 0 ;
if (User_set_Num.User_RYLQQ == (uint32_t)K_Line_User_RYLQQ * 1000u)
User_set_Num.User_RYLQQ = 0u ;
}
/*保养通知设定 更换变速箱油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_3)
{
if (User_set_Num.User_BSXY == (uint32_t)K_Line_Set.K_Line_LID4A * 1000 )
User_set_Num.User_BSXY = 0;
if (User_set_Num.User_BSXY == (uint32_t)K_Line_Set.K_Line_LID4A * 1000u)
User_set_Num.User_BSXY = 0u;
}
/*保养通知设定 更换差速器右*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_4)
{
if (User_set_Num.User_CSQY == (uint32_t)K_Line_Set.K_Line_LID4B * 1000 )
User_set_Num.User_CSQY = 0 ;
if (User_set_Num.User_CSQY == (uint32_t)K_Line_Set.K_Line_LID4B * 1000u)
User_set_Num.User_CSQY = 0u ;
}
/*保养通知设定 更换动力转向油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_6)
{
if (User_set_Num.User_DLZXY == (uint32_t)K_Line_Set.K_Line_LID4D * 1000 )
User_set_Num.User_DLZXY = 0 ;
if (User_set_Num.User_DLZXY == (uint32_t)K_Line_Set.K_Line_LID4D * 1000u)
User_set_Num.User_DLZXY = 0u ;
}
/*保养通知设定 轮胎换位.更换*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_7)
{
if (User_set_Num.User_LT == (uint32_t)K_Line_Set.K_Line_LID4E * 1000 )
User_set_Num.User_LT = 0 ;
if (User_set_Num.User_LT == (uint32_t)K_Line_Set.K_Line_LID4E * 1000u)
User_set_Num.User_LT = 0u ;
}
/*设置日期-年*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_11)
{
User_set_Num.Year ++;
if ( User_set_Num.Year > 99u)
{
User_set_Num.Year = 0u;
}
}
/*设置日期-月*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_12)
{
User_set_Num.Month++;
if (User_set_Num.Month > 12u)
{
User_set_Num.Month = 1u;
}
}
/*设置日期-日*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_13)
{
User_set_Num.Date++;
switch (User_set_Num.Month)
{
case 1:
case 3:
case 5:
case 7:
case 8:
case 10:
case 12:
if (User_set_Num.Date > 31u)
{
User_set_Num.Date = 1u;
}
break;
case 4:
case 6:
case 9:
case 11:
if (User_set_Num.Date > 30u)
{
User_set_Num.Date = 1u;
}
break;
case 2:
if (((User_set_Num.Year % 4u == 0u) && (User_set_Num.Year % 100 != 0u)) || (User_set_Num.Year % 400u == 0u))
{
User_set_Num.LeapYear = 1u;
}
else
{
User_set_Num.LeapYear = 0u;
}
if (User_set_Num.LeapYear)
{
if (User_set_Num.Date > 29u)
{
User_set_Num.Date = 1u;
}
}
else
{
if (User_set_Num.Date > 28u)
{
User_set_Num.Date = 1u;
}
}
break;
default:
break;
}
}
/*设置时间-时*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_21)
{
User_set_Num.Hour++ ;
if (User_set_Num.Hour > 23u)
{
User_set_Num.Hour = 0u ;
}
}
/*设置时间-分*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_22)
{
User_set_Num.Minute++;
if (User_set_Num.Minute > 59u)
{
User_set_Num.Minute = 0u ;
}
}
/*语言设置 ----反*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
{
if (User_set_Num.User_Language > 1)
if (User_set_Num.User_Language > 1u)
User_set_Num.User_Language-- ;
}
......@@ -150,38 +247,142 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
/*保养通知设定 更换机油&机油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_1)
{
if (User_set_Num.User_FDJYLQQ == 0 )
User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000 ;
if (User_set_Num.User_FDJYLQQ == 0u )
User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ;
}
/*保养通知设定 更换燃油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_2)
{
if (User_set_Num.User_RYLQQ == 0 )
User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000 ;
if (User_set_Num.User_RYLQQ == 0u )
User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u ;
}
/*保养通知设定 更换变速箱油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_3)
{
if (User_set_Num.User_BSXY == 0 )
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000 ;
if (User_set_Num.User_BSXY == 0u )
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u ;
}
/*保养通知设定 更换差速器油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_4)
{
if (User_set_Num.User_CSQY == 0 )
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000 ;
if (User_set_Num.User_CSQY == 0u )
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u ;
}
/*保养通知设定 更换动力转向液*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_6)
{
if (User_set_Num.User_DLZXY == 0 )
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000 ;
if (User_set_Num.User_DLZXY == 0u )
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u ;
}
/*保养通知设定 轮胎换位.更换*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_7)
{
if (User_set_Num.User_LT == 0 )
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000 ;
if (User_set_Num.User_LT == 0u )
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u ;
}
/*设置日期-年*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_11)
{
if ( User_set_Num.Year > 0u)
{
User_set_Num.Year--;
}
else
{
User_set_Num.Year = 99u;
}
}
/*设置日期-月*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_12)
{
if (User_set_Num.Month > 1u)
{
User_set_Num.Month--;
}
else
{
User_set_Num.Month = 12u;
}
}
/*设置日期-日*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_13)
{
User_set_Num.Date--;
switch (User_set_Num.Month)
{
case 1:
case 3:
case 5:
case 7:
case 8:
case 10:
case 12:
if (User_set_Num.Date < 1u)
{
User_set_Num.Date = 31u;
}
break;
case 4:
case 6:
case 9:
case 11:
if (User_set_Num.Date < 1u)
{
User_set_Num.Date = 30u;
}
break;
case 2:
if (((User_set_Num.Year % 4u == 0u) && (User_set_Num.Year % 100u != 0u)) || (User_set_Num.Year % 400u == 0u))
{
User_set_Num.LeapYear = 1u;
}
else
{
User_set_Num.LeapYear = 0u;
}
if (User_set_Num.LeapYear)
{
if (User_set_Num.Date < 1u)
{
User_set_Num.Date = 29u;
}
}
else
{
if (User_set_Num.Date < 1u)
{
User_set_Num.Date = 28u;
}
}
break;
default:
break;
}
}
/*设置时间-时*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_21)
{
if (User_set_Num.Hour > 0u)
{
User_set_Num.Hour--;
}
else
{
User_set_Num.Hour = 23u ;
}
}
/*设置时间-分*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_22)
{
if (User_set_Num.Minute > 0u)
{
User_set_Num.Minute-- ;
}
else
{
User_set_Num.Minute = 59u ;
}
}
/*语言设置 ----反*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
......@@ -218,16 +419,14 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_11) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_22)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
else if (((bCurMenuIDX >= _MN_DSP_LEVEL3_3_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_3_MENU_7)) ||
(bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3) ||
else if (((bCurMenuIDX >= _MN_DSP_LEVEL3_3_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_3)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL4_4_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL4_4_MENU_7)))
{
MenuFlag.Menu_Return = 1;
MenuFlag.Menu_Return = 1u;
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
/*轮胎匹配界面*/
......
source/Application/APP/Telltales/Telltales_user.c
View file @ da37d8ec
......@@ -1687,7 +1687,7 @@ uint8_t LED_BRAKE_AIR_or_EBS_YELLOW_R_Judgement(void)
{
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Get_ID_18F0010B_Sig_ABSorEBS_AmberWarnSt_power_veh();
m_Condition1 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
if (m_Condition1 == 1u)
{
......@@ -1771,7 +1771,7 @@ uint8_t LED_ABS_R_Judgement(void)
uint8_t m_Condition2 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ABS);
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_ABSorEBS_AmberWarnSt_power_veh();
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
if ((m_Condition1 == 1u) || (m_Condition2 == 1u))
{
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ da37d8ec
......@@ -137,7 +137,7 @@ typedef union
uint8_t Not_used8 : 1 ;
uint8_t TURN_L_Lamp_Status : 1 ;
uint8_t Not_used9 : 1 ;
uint8_t Not_used10 : 1 ;
uint8_t Not_used10 : 1 ;
} bit;
} _Msg18FF3E17Map;
void Can_Set_Buff_18FF3E17(uint8_t CopyData [])
......
source/Application/Graphic/GUI/GUI.c
View file @ da37d8ec
......@@ -4053,12 +4053,16 @@ void GUI_BG_UserSet_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_Date_Display(uint8_t Mode)
{
uint8_t YEAR_Value = 0u;
uint16_t YEAR_Value = 0u;
uint8_t MOnth_Value = 0u;
uint8_t Data_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
YEAR_Value = User_set_Num.Year;
MOnth_Value = User_set_Num.Month;
Data_Value = User_set_Num.Date;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_ri, GUI_BLENDMODE_SRC_OVER); /*日*/
......@@ -4115,6 +4119,9 @@ void GUI_BG_UserSet_Time_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL)
{
Hour_Value = User_set_Num.Hour;
Minute_Value = User_set_Num.Minute;
GUI_Translate_Display(MENU_Sprite, Nb_20_maohao, 440u, 218u, GUI_BLENDMODE_SRC_OVER); /*冒号*/
switch (bCurMenuIDX)
......
source/Application/Graphic/GUI/GUI.h
View file @ da37d8ec
......@@ -9,7 +9,7 @@
#define Language_En 0u
#define Language_Cn 1u
#define FState_COilTimeOutNum 60u /*3S*/
#define FState_COilTimeOutNum 60u /*3S*/
typedef struct
{
......@@ -78,8 +78,11 @@ typedef struct
extern volatile _Display_State_Flag State_Flag;
typedef struct
{
uint8_t SetDate; /* 设置日期标识*/
uint8_t SetTime; /* 设置时间标识*/
uint16_t Year; /* 年 */
uint8_t Month; /* 月 */
uint8_t Date; /* 日 */
uint8_t Hour; /* 时 */
uint8_t Minute; /* 分 */
uint8_t Language; /* 当前语言标识*/
uint8_t LeapYear; /* 设置闰年标识*/
uint8_t User_Gsl; /* 速度设定-高速路*/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ da37d8ec
......@@ -6,6 +6,7 @@
#include "Data_FuelConsump.h"
#include "CAN_Communication_Matrix.h"
#include "Common_Interface.h"
#include "RTE_TIME.h"
uint8_t bMenuSwFlag;
uint8_t g_ClearWin1;
......@@ -839,9 +840,13 @@ void Level3_3Menu_7Exit(void)
{}
/*----三级菜单----用户设定----系列子选项*/
/*日期设定*/
/*日期设定 ----- 年*/
void Level3_4Menu_1Enter_1(void)
{}
{
User_set_Num.Year = Get_RTC_YEAR();
User_set_Num.Month = Get_RTC_MONTH();
User_set_Num.Date = Get_RTC_DATE();
}
void Level3_4Menu_1Do_1(void)
{
GUI_OftenShow_Display();
......@@ -851,6 +856,7 @@ void Level3_4Menu_1Do_1(void)
void Level3_4Menu_1Exit_1(void)
{}
/*日期设定 ---- 月*/
void Level3_4Menu_1Enter_2(void)
{}
void Level3_4Menu_1Do_2(void)
......@@ -862,6 +868,7 @@ void Level3_4Menu_1Do_2(void)
void Level3_4Menu_1Exit_2(void)
{}
/*日期设定 ---- 日*/
void Level3_4Menu_1Enter_3(void)
{}
void Level3_4Menu_1Do_3(void)
......@@ -871,11 +878,25 @@ void Level3_4Menu_1Do_3(void)
GUI_BG_UserSet_Date_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_4Menu_1Exit_3(void)
{}
{
if (MenuFlag.Menu_Return)
{
RTE_RTC_Set_Year(User_set_Num.Year + 2000u);
RTE_RTC_Set_Month(User_set_Num.Month);
RTE_RTC_Set_Date(User_set_Num.Date);
/*时间设定*/
MenuFlag.Menu_Return = 0;
RTE_RTC_Confirm_Overwrite();
}
}
/*时间设定 ---- 时*/
void Level3_4Menu_2Enter_1(void)
{}
{
User_set_Num.Hour = Get_RTC_HOUR();
User_set_Num.Minute = Get_RTC_MINUTE();
}
void Level3_4Menu_2Do_1(void)
{
GUI_OftenShow_Display();
......@@ -885,6 +906,7 @@ void Level3_4Menu_2Do_1(void)
void Level3_4Menu_2Exit_1(void)
{}
/*时间设定 ---- 分*/
void Level3_4Menu_2Enter_2(void)
{}
void Level3_4Menu_2Do_2(void)
......@@ -894,7 +916,17 @@ void Level3_4Menu_2Do_2(void)
GUI_BG_UserSet_Time_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_4Menu_2Exit_2(void)
{}
{
if (MenuFlag.Menu_Return)
{
RTE_RTC_Set_Hour(User_set_Num.Hour);
RTE_RTC_Set_Minute(User_set_Num.Minute);
MenuFlag.Menu_Return = 0;
RTE_RTC_Confirm_Overwrite();
}
}
/*语言设定*/
void Level3_4Menu_3Enter(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