Commit f959d331 authored by hu's avatar hu

调整禅道问题

parent ceb4335d
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
#include "CAN_Communication_Matrix.h" #include "CAN_Communication_Matrix.h"
#include "GaugesInterface.h" #include "GaugesInterface.h"
#include "GPIO.h" #include "GPIO.h"
#include "DisplaySch_user.h"
#include "DispSch.h"
//------------------------------------------- //-------------------------------------------
//水温数据处理 //水温数据处理
//------------------------------------------- //-------------------------------------------
...@@ -170,6 +174,17 @@ uint8_t Coolant_Get_Valid(void) ...@@ -170,6 +174,17 @@ uint8_t Coolant_Get_Valid(void)
uint8_t Coolant_Get_CurSeg(void) uint8_t Coolant_Get_CurSeg(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
u8Result = CoolantVariable.CurSeg ; UElib_uint16_t HMI_MENU_Sta = 0u;
HMI_MENU_Sta = Get_Cur_HMI();
if (HMI_MENU_Sta != Display_StartAnimation)
{
u8Result = CoolantVariable.CurSeg ;
}
else
{
u8Result = 0;
}
return u8Result; return u8Result;
} }
\ No newline at end of file
...@@ -91,7 +91,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[]) ...@@ -91,7 +91,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Main_Air_Pressure = (uint8_t)((Common_Get_WET_Data() - 500u) / 20u); Main_Air_Pressure = (uint8_t)((Common_Get_WET_Data() - 500u) / 20u);
/*气压状态*/ /*气压状态*/
if ((K_Line_Set.K_Line_LID42 == 0x00u) || (K_Line_Set.K_Line_LID42 == 0x03u)) if ((K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u))
{ {
if (Common_Get_Air1_Data() != 0u) if (Common_Get_Air1_Data() != 0u)
{ {
...@@ -111,7 +111,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[]) ...@@ -111,7 +111,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Service_Brake_Circuit2_AirPressure = 0u; Service_Brake_Circuit2_AirPressure = 0u;
} }
} }
else if ((K_Line_Set.K_Line_LID42 == 0x01u) || (K_Line_Set.K_Line_LID42 == 0x02u)) else if ((K_Line_Set.K_Line_LID42 == 0x00u) || (K_Line_Set.K_Line_LID42 == 0x01u))
{ {
if (Common_Get_Air2_Data() != 0u) if (Common_Get_Air2_Data() != 0u)
{ {
...@@ -466,7 +466,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -466,7 +466,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
{ {
Water_Temp_Level = 0 ; Water_Temp_Level = 0 ;
} }
else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12) && (Temperature >= 0x96u)) else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12))
{ {
Water_Temp_Level = 1 ; Water_Temp_Level = 1 ;
} }
...@@ -1459,7 +1459,7 @@ void Drive_Info_IC1_STATUS_Rx(void) ...@@ -1459,7 +1459,7 @@ void Drive_Info_IC1_STATUS_Rx(void)
if (Data_Sig == 0x40u) if (Data_Sig == 0x40u)
{ {
State_Flag.FState_ClearOilRx == 1; State_Flag.FState_ClearOilRx = 1;
} }
} }
......
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