增加机油压力转速时间控制-图片和声音

source/Application/Alarm/Popups.c

@@ -395,7 +395,7 @@ void Popups_Polling(void)
             /*21.--3--油压(机油)请在安全场所停车 发动机启动(350r/min)后、350r/min持续5秒以上时，A32信号（10ms周期监测），连续20次检出Lo时。*/
             variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
 
-            if ((E_Speed > 350u) && (variable_1 == LINE_IN_LOGIC_VALID))
+            if ((E_Speed > 350u) && (variable_1 == LINE_IN_LOGIC_VALID) && (Common_Get_OIL_PRESSURE_Time() >= 2500))
             {
                 Popup_Request(POPUP5_ENGINE_OIL_PRESSURE);
             }
@@ -1179,6 +1179,7 @@ void Popup_Alone_Sound_Server(void)
     uint32_t u32IG_ON_Timer = 0x00u;
     uint8_t variable_1 = 0u;
     uint8_t variable_2 = 0u;
+    uint16_t E_Speed = 0u;
     uint16_t V_Speed = 0u;
     uint8_t EVSC1 = 0u;
     uint8_t EVSC2 = 0u;
@@ -1194,6 +1195,9 @@ void Popup_Alone_Sound_Server(void)
     u32IG_OFF_Timer = Common_GetIgnOffTime();
     u8IG_st = Common_Get_IG_Sts();
 
+    V_Speed = Common_Get_Disp_V_Speed(); /*车速*/
+    E_Speed = Common_Get_Act_E_Speed();  /*转速*/
+
     if ((u32IG_ON_Timer <= PopupStart) && (u32IG_ON_Timer >= 2u))
     {
         /*00 忘拔钥匙*/
@@ -1279,7 +1283,11 @@ void Popup_Alone_Sound_Server(void)
             }
 
             /*08 -(预留：油压)*/
-            if (CD4051_COM2_X1_IN == 0u)
+            if (
+                (E_Speed > 350u) &&
+                (Line_In_Get_Status(LINE_IN_ENG_OIL) == LINE_IN_LOGIC_VALID) &&
+                (Common_Get_OIL_PRESSURE_Time() >= 2500u)
+            )
             {
                 Sound_Request(SND_Oil_pressure_Low, 1u);
             }

source/Application/RTE/Common_Interface.c

@@ -86,6 +86,7 @@ static uint32_t LOW_VOLTAGE;
 
 static uint32_t TPMS_TEST_OFF_TIME;
 static uint32_t Menu_FacDea_Time;
+static uint32_t OIL_PRESSURE_Time;
 
 uint32_t UdsCanIDSta;
 
@@ -135,7 +136,7 @@ void Common_DataInit(void)
 
     TPMS_TEST_OFF_TIME = 0x00u;
     Menu_FacDea_Time = 0x00u;
-
+    OIL_PRESSURE_Time = 0x00u;
     Set_18EF1718_Msg_Sta = COMMON_InValid;
     //Menu_Off_Time = 0x00u;
     UdsCanIDSta = 0x00u;
@@ -412,6 +413,19 @@ void Common_Input_Para(void)
                 ;/*Do Nothing!*/
             }
         }
+
+        /**/
+        if ((OilValue > 350u) && (Line_In_Get_Status(LINE_IN_ENG_OIL) == LINE_IN_LOGIC_VALID))
+        {
+            if (OIL_PRESSURE_Time < 5000u)
+            {
+                OIL_PRESSURE_Time++;
+            }
+        }
+        else
+        {
+            OIL_PRESSURE_Time = 0u;
+        }
         /**/
         if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2))
         {
@@ -532,6 +546,7 @@ void Common_Input_Para(void)
     }
     else
     {
+        OIL_PRESSURE_Time = 0u;
         PowerIgnOnTimeLine = 0ul;
         if (PowerIgnOffTimeLine < 0x7ffffffful)
         {
@@ -913,4 +928,9 @@ void Common_Set_UdsCanIDSta(uint32_t Val)
 uint32_t Common_Get_UdsCanIDSta(void)
 {
     return UdsCanIDSta;
+}
+
+uint32_t Common_Get_OIL_PRESSURE_Time(void)
+{
+    return OIL_PRESSURE_Time;
 }
\ No newline at end of file

source/Application/RTE/Common_Interface.h

@@ -64,5 +64,6 @@ void Common_Set_K_Line_Value(void);
 
 void Common_Set_UdsCanIDSta(uint32_t Val);
 uint32_t Common_Get_UdsCanIDSta(void);
+uint32_t Common_Get_OIL_PRESSURE_Time(void);
 
 #endif