调整水温报警相关

source/Application/APP/Key/Key_user.c

@@ -1552,18 +1552,21 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
     }
     else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
     {
-        if (User_set_Num.Trip_Type == TRAPA)
-        {
-            Data_Clear_Trip(EM_TRIP_A);
-        }
-        else
+        if (PowerStatus == COMMON_POWER_ON)
         {
-            Data_Clear_Trip(EM_TRIP_B);
-        }
+            if (User_set_Num.Trip_Type == TRAPA)
+            {
+                Data_Clear_Trip(EM_TRIP_A);
+            }
+            else
+            {
+                Data_Clear_Trip(EM_TRIP_B);
+            }
 
-        if (State_Flag.FState_ClearOilTx == 0u)
-        {
-            State_Flag.FState_ClearOilTx = 1u;
+            if (State_Flag.FState_ClearOilTx == 0u)
+            {
+                State_Flag.FState_ClearOilTx = 1u;
+            }
         }
     }
 #if 0

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -19,7 +19,6 @@
 #include "Line_in.h"
 #include "Menu.h"
 #include "kwp2000_service.h"
-
 #include "DisplaySch_user.h"
 #include "DispSch.h"
 
@@ -28,12 +27,13 @@ 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;
+uint8_t DisDTCNum;
 uint8_t Id18FFE517Msg_TXSUCCESSNum;
 
+static uint8_t Water_Temp_Level_Flag;
+
 /*---------------------------------------------------------------------------
 使用しない Byte、bit に関しては全て 1(B)をセットして出力すること
 对于不使用的Byte、bit，全部设置1(B)并输出
@@ -362,7 +362,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
     uint8_t Water_Temp_Level = 0u;            /*水温状态*/
     uint8_t Remining_Fuel_Warning = 0u;       /*剩余燃料报警*/
     uint8_t Battery_Maintenance_Warning = 0u; /*电池维护报警*/
-    static uint8_t Over_Heat_Warning_Status = 0u;    /*水温状态*/
+    uint8_t Over_Heat_Warning_Status = 0u;    /*水温状态*/
     uint8_t Meter_Malfunction = 0u;           /*仪表故障*/
     uint8_t SRS_Input = 0u;
     uint8_t SW_Rear_Body_Warning = 0u;
@@ -504,7 +504,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
 
 uint8_t Common_Get_Water_Temp_Level_Flag(void)
 {
-    return Water_Temp_Level_Flag ;
+    return (uint8_t)Water_Temp_Level_Flag ;
 }
 
 /*-------------------------------------------------------------------------