Commit 85acada6 authored by hu's avatar hu

:

parent a10e5075
......@@ -480,7 +480,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x18FEE64Aul,
(( void * )0),
(Common_Set_18FEE64A_Msg_Sta),
(( void * )0),
(( void * )0),
},
......
......@@ -614,6 +614,7 @@ void GUI_Time_Dispaly(uint8_t Mode)
uint8_t Time_Hours = 0u;
uint8_t Time_Minutes = 0u;
uint8_t CanStatus = 0u;
uint8_t CanStatus1 = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
//if (K_Line_Set.K_Line_LID54 == 0x01u)
......@@ -621,8 +622,8 @@ void GUI_Time_Dispaly(uint8_t Mode)
{
/*T_BOX 时间显示*/
CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
if (CanStatus == CAN_SIG_NORMAL)
CanStatus1 = Common_Get_18FEE64A_Msg_Sta();
if ((CanStatus == CAN_SIG_NORMAL) && (CanStatus1 == 1))
{
Time_Minutes = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Minutes();
if (Time_Minutes > 59)
......@@ -718,6 +719,7 @@ void GUI_Data_Dispaly(uint8_t Mode)
uint8_t Date = 0u; /*日*/
uint8_t Week = 0u; /*星期*/
uint8_t CanStatus = 0u;
uint8_t CanStatus1 = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
......@@ -725,7 +727,7 @@ void GUI_Data_Dispaly(uint8_t Mode)
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
CanStatus1 = Common_Get_18FEE64A_Msg_Sta();
Year = (uint16_t)Get_ID_18FEE64A_Sig_TBOX_Year();
Year = (Year & 0xFF) + 1985u;
Month = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Month();
......@@ -783,7 +785,7 @@ void GUI_Data_Dispaly(uint8_t Mode)
Week = Cal_RTC_Week(Year, Month, Date);
if (CanStatus == CAN_SIG_NORMAL)
if ((CanStatus == CAN_SIG_NORMAL) && (CanStatus1 == 1))
{
GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 62u, GUI_BLENDMODE_SRC_OVER); /*显示年份后面的 “ . ” */
GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 640u, 62u, GUI_BLENDMODE_SRC_OVER); /*显示月份后面的 “ . ” */
......@@ -2420,7 +2422,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
uint8_t Week = 0u; /*星期*/
uint16_t Year = 0u; /*年*/
uint8_t CanStatus = 0u;
uint8_t CanStatus1 = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
//if (K_Line_Set.K_Line_LID54 == 0x01u)
......@@ -2496,8 +2498,8 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
}
CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
if (CanStatus == CAN_SIG_NORMAL)
CanStatus1 = Common_Get_18FEE64A_Msg_Sta();
if ((CanStatus == CAN_SIG_NORMAL) && (CanStatus1 == 1))
{
if (User_App.User_Language == Language_Cn)
{
......
......@@ -44,6 +44,7 @@ static DataValid_t Disp_V_Speed_Valid;
static DataValid_t Disp_E_Speed_Valid;
static DataValid_t Set_18EF1718_Msg_Sta;
static DataValid_t Set_18FEE64A_Msg_Sta;
static void Common_Set_Act_V_Speed(uint16_t Val);
static void Common_Set_Act_E_Speed(uint16_t Val);
......@@ -143,6 +144,7 @@ void Common_DataInit(void)
Menu_FacDea_Time = 0x00u;
OIL_PRESSURE_Time = 0x00u;
Set_18EF1718_Msg_Sta = COMMON_InValid;
Set_18FEE64A_Msg_Sta = COMMON_InValid;
//Menu_Off_Time = 0x00u;
UdsCanIDSta = 0x00u;
Can_Engine_Oil_Num = 0u;
......@@ -951,6 +953,16 @@ DataValid_t Common_Get_18EF1718_Msg_Sta(void)
return Set_18EF1718_Msg_Sta;
}
void Common_Set_18FEE64A_Msg_Sta(void)
{
Set_18FEE64A_Msg_Sta = COMMON_Valid;
}
DataValid_t Common_Get_18FEE64A_Msg_Sta(void)
{
return Set_18FEE64A_Msg_Sta;
}
/*EOL诊断配置数据转换为仪表配置数据*/
void ReadDTCEOLValue_Meter_K_LINE(void)
{
......
......@@ -61,6 +61,8 @@ uint32_t Coom_Get_Menu_Off_MenuTime(void);
void Common_Set_18EF1718_Msg_Sta(void);
DataValid_t Common_Get_18EF1718_Msg_Sta(void);
void Common_Set_18FEE64A_Msg_Sta(void);
DataValid_t Common_Get_18FEE64A_Msg_Sta(void);
void ReadDTCEOLValue_Meter_K_LINE(void);
void Common_Set_K_Line_Value(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