调整水温报警相关内容

source/Application/APP/PowerManagement/PowerManagement_user.c

@@ -331,12 +331,12 @@ Power_Status_t Power_Stay_OFF(void)
 
 Power_Status_t  Power_Stay_Protect(void)
 {
-    Power_Status_t u8PowerSts = m_IGN_LIMIT;
+    Power_Status_t u8PowerSts = m_IGN_OFF_Init;
 
-    if (SYS_OPR_STAT_RUN)
-    {
-        u8PowerSts = m_IGN_ON;
-    }
+    //if (SYS_OPR_STAT_RUN)
+    //{
+    //    u8PowerSts = m_IGN_ON;
+    //}
 
     return  u8PowerSts;
 }

source/Application/APP/PowerManagement/System_Monitor.h

@@ -2,7 +2,7 @@
 #ifndef SYSTEM_MONITOR_H
 #define SYSTEM_MONITOR_H
 
-
+#include "System_Monitor.h"
 #include "TYW_stdint.h"
 
 

source/Application/Alarm/Popups.c

@@ -24,8 +24,7 @@
 #include "Telltales.h"
 
 #include "kwp2000_service.h"
-
-static uint8_t Water_Temp_Level_Flag;
+#include "CAN_FUNC.h"
 
 /*-------------------------------------------------------------------------
  * Function Name  : Popups_Management_Service
@@ -366,25 +365,15 @@ void Popups_Polling(void)
 
             /*----第五组---------------------------------------------------------------------*/
             /*19.--1--过热（过热，请在安全的场所停车）有车速     LID $43 :0x82*/
-            variable_1 = Coolant_Get_Valid();
-            variable_2 = Coolant_Get_CurSeg();
+            variable_1 = Common_Get_Water_Temp_Level_Flag();
 
-            if (K_Line_Set.K_Line_LID43 == 0x82)
+            if ((variable_1 == 1u) && (K_Line_Set.K_Line_LID43 == 0x82))
             {
-                if ((variable_1 == 1u) && (variable_2 >= 12u))
-                {
-                    Popup_Request(POPUP5_OVER_HEAT);
-                    Water_Temp_Level_Flag = 1u;
-                }
-                else if (variable_2 <= 9u)
-                {
-                    Popup_Delete(POPUP5_OVER_HEAT);
-                    Water_Temp_Level_Flag = 0u;
-                }
+                Popup_Request(POPUP5_OVER_HEAT);
             }
             else
             {
-                Popup_Clear(POPUP5_OVER_HEAT);
+                Popup_Delete(POPUP5_OVER_HEAT);
             }
 
             /*20.--2--冷却水（冷却液不足） B32 GND*/
@@ -1205,9 +1194,8 @@ void Popup_Alone_Sound_Server(void)
             }
 
             /*06 水温过热*/
-            variable_1 = Coolant_Get_CurSeg();
-            variable_2 = Coolant_Get_Valid();
-            if ((variable_1 >= 12u) && (variable_2 == 1u))
+            variable_1 = Common_Get_Water_Temp_Level_Flag();
+            if ((variable_1 == 1) && (K_Line_Set.K_Line_LID43 == 0x82))
             {
                 Sound_Request(SND_Temp_High, 1u);
             }
@@ -1491,7 +1479,3 @@ void Popup_Alone_Sound_Server(void)
 }
 
 
-uint8_t Common_Get_Water_Temp_Level_Flag(void)
-{
-    return Water_Temp_Level_Flag ;
-}
\ No newline at end of file

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -20,8 +20,6 @@
 #include "Menu.h"
 #include "kwp2000_service.h"
 
-#include "Popups.h"
-
 #include "DisplaySch_user.h"
 #include "DispSch.h"
 
@@ -30,6 +28,7 @@ uint8_t TpmsMsg18033317SendFlag = 0;
 uint8_t Msg_18021733[8];
 static uint8_t TXNum_18033317;
 static uint8_t User_BCM_Flag;
+static uint8_t Water_Temp_Level_Flag;
 
 uint32_t DisDTCNumber[50];
 uint8_t  DisDTCNum;
@@ -437,13 +436,15 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
         }
     }
 
-    if ((Common_Get_Water_Temp_Level_Flag() == 1) && (Common_Get_Disp_V_Speed() > 20))
+    if ((Coolant_Get_Valid() == 1u) && (Coolant_Get_CurSeg() >= 12u) && (Common_Get_Disp_V_Speed() > 20))
     {
         Over_Heat_Warning_Status = 1 ;
+        Water_Temp_Level_Flag = 1u;
     }
-    else
+    else if (Coolant_Get_CurSeg() <= 9)
     {
         Over_Heat_Warning_Status = 0 ;
+        Water_Temp_Level_Flag = 0u;
     }
 
     /*电源电压*/
@@ -493,6 +494,11 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
                             ((IRIS_Warning_Lamp_Status << 5u) & 0x20u)); /* 8  */
 }
 
+uint8_t Common_Get_Water_Temp_Level_Flag(void)
+{
+    return Water_Temp_Level_Flag ;
+}
+
 /*-------------------------------------------------------------------------
  * Function Name  : Can_Set_Buff_18FF9D17
  * Description    :

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h

@@ -71,7 +71,7 @@ void Common_SetId18FFE517Msg_TXSUCCESS(void);
 uint8_t Common_GetId18FFE517Msg_TXSUCCESS(void);
 void Common_Set_LDWS_Flag_Sta(uint8_t Vol);
 uint8_t Common_Get_LDWS_Flag_Sta(void);
-
+uint8_t Common_Get_Water_Temp_Level_Flag(void);
 
 void Common_DTC_Server(void);
 void GetAllDtcFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);