五征EF01软件变更申请单20240807变更点2：调整机油压力报警灯报警逻辑

code/Sources/Application/src/Telltales.c

@@ -418,7 +418,7 @@ void Telltales_Management(void)
 		//31 ����ѹ����   EngOilPress                             15
 
 	  //	#if ModVersion == Version_KANG
-		if (NVM_CONFIG_KANG > 0)
+		if (0)//NVM_CONFIG_KANG > 0)
 		{
       if (EngOilPress == 0)		
   		{
@@ -461,9 +461,19 @@ void Telltales_Management(void)
     }		 		
 		else
 		{
-      if ((EngOilPress < 25) || ((EngOilPress * 2) > 325))     //��100Kpa����650Kpa
+      if ((DataCoolantOilSegDisp < 60) && (EngOilPress < 15) /* || ((EngOilPress * 2) > 325)*/) /* 60kPa */
 		  {
 			  BD83790A |= BD8379_D6;
+			  
+			  if (ESpeed_300_2S_Sts) 
+			  {
+			    Sound_Request(SND_LOW_OIL_SPEED, 1);
+			  }
+			  else
+			  {
+			    Sound_Delete(SND_LOW_OIL_SPEED);
+			  }
+			  
 			  if (EngOilPress_Count <= 60)
 			  { 
 			    EngOilPress_Count++;
@@ -489,6 +499,7 @@ void Telltales_Management(void)
 		  }
 		  else 
 		  {
+				Sound_Delete(SND_LOW_OIL_SPEED);
 				if ((EngOilPress_Count > 0) && (EngOilPress_Count <= 60))
 			  {
 			    LED_RIGHT_RED   = 1;
@@ -2371,6 +2382,7 @@ void Telltales_Management(void)
 		Sound_Delete(SND_LOW_FUEL_SPEED); //ȼ��Һλ�ͱ������ر�
 		Sound_Delete(SND_OVER_SPEED);     //����
 		Sound_Delete(SND_AEB);
+		Sound_Delete(SND_LOW_OIL_SPEED);
 	}	
 	else if (SYS_SELF_TEST_DISP_MODE)   //�Լ�
 	{
@@ -2390,12 +2402,14 @@ void Telltales_Management(void)
     LowBrakeLuidLevel_timp = 0;
     TelltaleLCDFlag.Sig.LCD32 = 0;
 		Sound_Delete(SND_CNG_GasLeak);
+		Sound_Delete(SND_LOW_OIL_SPEED);
   }
 	else
 	{
 	   Sound_Delete(SND_LockWithKeyInCar);
 	   TelltaleLCDFlag.Sig.LCD32 = 0;
 		 Sound_Delete(SND_CNG_GasLeak);
+		 Sound_Delete(SND_LOW_OIL_SPEED);
 		 LowBrakeLuidLevel_timp = 0;
 	}
 	

code/Sources/Implementation/inc/Data_Processor.h

@@ -32,6 +32,9 @@ extern uint16_t DataESpeedDisp;
 extern uint8_t  DataESpeedValid;
 extern uint8_t  Maintain_alarm;
 
+extern uint8_t  ESpeed_300_2S_Sts;
+extern uint8_t  ESpeed_300_2S_Time;
+
 #define  DATA_ENGINE_SPEED_ACTUAL           DataESpeedActual
 #define  DATA_ENGINE_SPEED_DISPLAYING       DataESpeedDisp
 #define  DATA_ENGINE_SPEED_VALID            DataESpeedValid

code/Sources/Implementation/src/Data_Processor.c

@@ -12,6 +12,9 @@ DataESpeedSamplerStruct DataESpeedSampler;
 DataESPeedDampingStruct DataESPeedDamping;
 DataESpeedIdleStruct    DataESpeedIdle;
 uint16_t DataFuelVolRemaining;
+uint8_t                 ESpeed_300_2S_Time;
+uint8_t                 ESpeed_300_2S_Sts;
+
 /*** 车速 ***/
 uint16_t  DataVSpeedActual;
 uint16_t  DataVSpeedDisp;
@@ -134,6 +137,8 @@ void Data_Power_On_Init(void)
 	DataESPeedDamping.Speed   = 0;
 	DataESPeedDamping.Delta   = 0;
 	DataESPeedDamping.Dir     = DATA_APPR_DIR_INC;
+	ESpeed_300_2S_Sts         = 0;
+	ESpeed_300_2S_Time        = 0;
   Fuel_Seg = 0; //燃油段数初始化
   //Espeed_Seg_Disp[0] = 0;
   //Espeed_Seg_Disp[1] = 0;
@@ -523,6 +528,23 @@ void Data_Engine_Speed_Processing_Service(void)
 	//  ESpeed = DataESpeedSampler.Backup;
 	//else
 	ESpeed = DataESpeedActual;
+	
+	if (ESpeed > 300)
+	{
+	  if (ESpeed_300_2S_Time < 100)
+	  {
+	    ESpeed_300_2S_Time++;
+	  }
+	  else
+	  {
+	    ESpeed_300_2S_Sts = 1;
+	  }
+	}
+	else
+	{
+	  ESpeed_300_2S_Time = 0;
+	  ESpeed_300_2S_Sts  = 0;
+	}
 
 	if ((ESpeed >= 500) && (ESpeed <= 1000)) //20200109
   //if ((ESpeed >= 500) && (ESpeed <= 6000))

code/Sources/Module/inc/Sound_Source.h

@@ -93,7 +93,7 @@ static const SndAttributeStruct SndAttributeTable[] =
   {/* SND_RF_HOOVES_ERROR1      13 */   0x01,      0,                 1,  SND_MODE_SINGLE  ,     500,},
   {/* SND_LR_HOOVES_ERROR1      14 */   0x01,      0,                 1,  SND_MODE_SINGLE  ,     500,},
   {/* SND_RR_HOOVES_ERROR1      15 */   0x01,      0,                 1,  SND_MODE_SINGLE  ,     500,},
-  {/* SND_LOW_OIL_SPEED1        16 */   0x01,      0,                 1,  SND_MODE_SINGLE  ,     500,},
+  {/* SND_LOW_OIL_SPEED1        16 */   0x03,      0,                10,  SND_MODE_SINGLE  ,     500,},
   {/* SND_LOW_FUEL_SPEED1       17 */   0x01,      0,                 1,  SND_MODE_SINGLE  ,    1000,},
   {/* SND_SRC_TICK                 */   0x05,      0,                 1,  SND_MODE_SINGLE  ,     100,},
   {/* SND_SRC_TOCK                 */   0x06,      0,                 1,  SND_MODE_SINGLE  ,     100,},

code/Sources/System/src/main.c

@@ -31,7 +31,7 @@
 //20240515 修改禅道QAC高危问题：42983、42982、42979
 //20240522 修改禅道QAC高危问题：43378
 
-//20240807 屏蔽行车信息显示
+//20240807 屏蔽行车信息显示；修改油压报警灯逻辑
 
 #include "main.h"
 #include "fuelconfig.h"