Commit 45e89c2d authored by hu's avatar hu

调整BUG

parent 2745e5ea
...@@ -1510,6 +1510,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent) ...@@ -1510,6 +1510,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
HMI_MENU_Sta = Get_Cur_HMI(); HMI_MENU_Sta = Get_Cur_HMI();
DispVSpeed = Common_Get_Disp_V_Speed(); DispVSpeed = Common_Get_Disp_V_Speed();
PowerStatus = Common_Get_IG_Sts();
if (enKeyEvent == KEY_EVENT_OFF_TO_ON) if (enKeyEvent == KEY_EVENT_OFF_TO_ON)
{ {
...@@ -1517,8 +1518,6 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent) ...@@ -1517,8 +1518,6 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
} }
else if (enKeyEvent == KEY_EVENT_SHORT_PRESS) else if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
PowerStatus = Common_Get_IG_Sts();
if (PowerStatus == COMMON_POWER_ON) if (PowerStatus == COMMON_POWER_ON)
{ {
if (HMI_MENU_Sta == Display_StartAnimation) if (HMI_MENU_Sta == Display_StartAnimation)
......
...@@ -409,9 +409,13 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -409,9 +409,13 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
/*手刹状态*/ /*手刹状态*/
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 1u) if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 1u)
{
SW_Parking = 1 ; SW_Parking = 1 ;
}
else else
{
SW_Parking = 0 ; SW_Parking = 0 ;
}
/*水温状态*/ /*水温状态*/
if ((Get_ID_18FEEE00_Sig_Engine_Coolant_Temperature() > 0xFA) || if ((Get_ID_18FEEE00_Sig_Engine_Coolant_Temperature() > 0xFA) ||
...@@ -422,7 +426,6 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -422,7 +426,6 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
else if ((Coolant_Get_CurSeg() >= 0) && (Coolant_Get_CurSeg() < 11)) else if ((Coolant_Get_CurSeg() >= 0) && (Coolant_Get_CurSeg() < 11))
{ {
Water_Temp_Level = 0 ; Water_Temp_Level = 0 ;
} }
else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12)) else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12))
{ {
...@@ -436,7 +439,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -436,7 +439,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
} }
} }
if ((Coolant_Get_Valid() == 1u) && (Coolant_Get_CurSeg() >= 12u)) if ((Coolant_Get_Valid() == 1u) && (Coolant_Get_CurSeg() >= 12u) && (HMI_MENU_Sta != Display_StartAnimation))
{ {
Water_Temp_Level_Flag = 1u; Water_Temp_Level_Flag = 1u;
} }
...@@ -452,7 +455,6 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -452,7 +455,6 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
else else
{ {
Over_Heat_Warning_Status = 0 ; Over_Heat_Warning_Status = 0 ;
} }
/*电源电压*/ /*电源电压*/
......
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