TYW-2025-00635变更，1、增加气量控制信号,与原信号为或的关系

code/Sources/Application/src/Telltales.c

@@ -1366,25 +1366,25 @@ void Telltales_Management(void)
 		  TelltaleLCDFlag.Sig.LCD32 = 0;
 		  Sound_Delete(SND_CNG_GasLeak);
 		}
-		
-		if ((EMS_51C_STATUS & CAN_MSG_LOST) || (EMS_CylinderPressure > 64255))
+
+		if (((EMS_51C_STATUS & CAN_MSG_LOST) || (EMS_CylinderPressure > 64255)) && (LLM_EB4E_STATUS & CAN_MSG_LOST))
 		{
 		  if (STEPPER_MOTOR_0_CUR_STEP <= 100)
 		    TelltaleLCD_Flag33 = 1; //锟斤拷然锟斤拷锟斤拷锟斤拷锟斤拷状态指示锟斤拷
 		} 
-		else if (EMS_CylinderPressure < 3200)
+		else if (DataCoolantADblue < 10)//(EMS_CylinderPressure < 3200)
 		{
 		   if (STEPPER_MOTOR_0_CUR_STEP <= 223)
 		     TelltaleLCD_Flag33 = FLASH_SYNC_1Hz;
 		} 
-		else if (EMS_CylinderPressure < 5000)
+		else if (DataCoolantADblue < 17)//(EMS_CylinderPressure < 5000)
 		{
-		  if (STEPPER_MOTOR_0_CUR_STEP <= 460)
+		  if (STEPPER_MOTOR_0_CUR_STEP <= 421)
 		    TelltaleLCD_Flag33 = 1; //锟斤拷然锟斤拷锟斤拷锟斤拷锟斤拷状态指示锟斤拷
 		}
-		else if (EMS_CylinderPressure >= 6200)
+		else if (DataCoolantADblue >= 21)//(EMS_CylinderPressure >= 6200)
 		{
-		  if (STEPPER_MOTOR_0_CUR_STEP >= 582)
+		  if (STEPPER_MOTOR_0_CUR_STEP >= 520)
 		    TelltaleLCD_Flag33 = 0; 
 		}
 		//锟斤拷锟斤拷锟斤拷锟斤拷  硬锟斤拷    21

code/Sources/Implementation/src/Data_Processor.c

@@ -1951,11 +1951,12 @@ void Data_Coolant_Oil_Processing_Service(void)
  ******************************************************************************/
 void Data_Coolant_ADblue_Processing_Service(void)
 {
-	uint16_t Temp = 0;
+	uint16_t Temp = 0, Temp1 = 0;
 	uint8_t  Step;
   
-  Temp = EMS_CylinderPressure;
-  if ((Temp > 64255) || (EMS_51C_STATUS & CAN_MSG_LOST) || (IO_DISP_TEST_OFF_TIME <= 20))    
+  Temp1 = LLM_LiquidLever_PCT;
+  Temp  = EMS_CylinderPressure;
+  if ((((Temp > 64255) || (EMS_51C_STATUS & CAN_MSG_LOST)) && (LLM_EB4E_STATUS & CAN_MSG_LOST)) /*|| (IO_DISP_TEST_OFF_TIME <= 20)*/)    
   {
     if (DataCoolantADblueCalc.LostTimer < 17)        //250
     {
@@ -1980,64 +1981,73 @@ void Data_Coolant_ADblue_Processing_Service(void)
   }
   else
   {
-		if (Temp <= 2000)
-		{
-		  Temp = 0;
-		} 
-		else if (Temp <= 3500)
+		if ((LLM_EB4E_STATUS & CAN_MSG_LOST) == 0)
 		{
-		  Temp = (Temp - 2000) / 125;
+		  Temp1 *= 39;
+		  Temp1 /= 100;
+		  DataCoolantADblue = Temp1;
 		}
-		else if (Temp <= 7100)
-		{
-		  Temp = 12 + (Temp - 3500) / 300;
-		} 
-		else if (Temp < 7500)
-		{
-		  Temp = 24;
-		}
-		else if (Temp < 8000)
-		{
-		  Temp = 25;
-		} 
-		else if (Temp <= 11220)
-	  {
-	    Temp = 26 + (Temp - 8000) / 140;
-	  }
-	  else if (Temp < 11500)
-		{
-		  Temp = 49;
-		}
-		else if (Temp < 12000)
-		{
-		  Temp = 50;
-		}
-		else if (Temp <= 15220)
-	  {
-	    Temp = 51 + (Temp - 12000) / 140;
-	  }
-	  else if (Temp < 15500)
-		{
-		  Temp = 74;
-		}
-		else if (Temp < 16000)
+		else
 		{
-		  Temp = 76;
+		  if (Temp <= 2000)
+  		{
+  		  Temp = 0;
+  		} 
+  		else if (Temp <= 3500)
+  		{
+  		  Temp = (Temp - 2000) / 125;
+  		}
+  		else if (Temp <= 7100)
+  		{
+  		  Temp = 12 + (Temp - 3500) / 300;
+  		} 
+  		else if (Temp < 7500)
+  		{
+  		  Temp = 24;
+  		}
+  		else if (Temp < 8000)
+  		{
+  		  Temp = 25;
+  		} 
+  		else if (Temp <= 11220)
+  	  {
+  	    Temp = 26 + (Temp - 8000) / 140;
+  	  }
+  	  else if (Temp < 11500)
+  		{
+  		  Temp = 49;
+  		}
+  		else if (Temp < 12000)
+  		{
+  		  Temp = 50;
+  		}
+  		else if (Temp <= 15220)
+  	  {
+  	    Temp = 51 + (Temp - 12000) / 140;
+  	  }
+  	  else if (Temp < 15500)
+  		{
+  		  Temp = 74;
+  		}
+  		else if (Temp < 16000)
+  		{
+  		  Temp = 76;
+  		}
+  		else if (Temp <= 18760)
+  	  {
+  	    Temp = 76 + (Temp - 16000) / 120;
+  	  }
+  	  else if (Temp < 19000)
+  		{
+  		  Temp = 99;
+  		} 
+  		else
+  	  {
+  	    Temp = 100;   
+  	  }
+      
+      DataCoolantADblue = Temp;
 		}
-		else if (Temp <= 18760)
-	  {
-	    Temp = 76 + (Temp - 16000) / 120;
-	  }
-	  else if (Temp < 19000)
-		{
-		  Temp = 99;
-		} 
-		else
-	  {
-	    Temp = 100 ;   
-	  }
-    
-    DataCoolantADblue               = Temp;    
     DataCollantADblueValid          = 1;
     DataCoolantADblueCalc.LostTimer = 0;
   }

code/Sources/Protocol/inc/CAN_Communication_Matrix.h

@@ -2268,6 +2268,38 @@ extern volatile uint8_t             CANMsg18FEC600Status;
 static const uint8_t  CANMsg18FEC600Init[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18FEC600Timeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static const uint8_t  CANMsg18FEC600Mask[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+/******************************************************************************
+LLM_EB4E  
+ID:0x18FFEB4E
+******************************************************************************/
+typedef union
+{
+	uint8_t Msg[8];
+	struct
+	{		
+		uint8_t   b00_07 	:  8;   //   
+		uint8_t   b08_15 	:  8;   //   
+		uint8_t   b16_23 	:  8;   // 
+		uint8_t   b24_31 	:  8;   // 
+
+		uint8_t   b32_39 	:  8;   //	
+		uint8_t   b40_47 	:  8;   //LLM_LiquidLever_PCT	 
+		uint8_t   b48_55 	:  8;   //   
+		uint8_t   b56_63 	:  8;   //  	
+	} Sig; 
+} CANMsg18FFEB4EUnion;
+
+extern volatile CANMsg18FFEB4EUnion CANMsg18FFEB4E;
+extern volatile uint8_t             CANMsg18FFEB4EStatus;
+
+#define LLM_EB4E          		      0x18FFEB4E
+#define LLM_EB4E_STATUS       	    CANMsg18FFEB4EStatus
+
+#define LLM_LiquidLever_PCT 	      CANMsg18FFEB4E.Sig.b40_47
+
+static const uint8_t  CANMsg18FFEB4EInit[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const uint8_t  CANMsg18FFEB4ETimeout[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const uint8_t  CANMsg18FFEB4EMask[8]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 /*****************************************************************************************************************************************************************************
 报文属性预定义
 *****************************************************************************************************************************************************************************/ 
@@ -2388,9 +2420,10 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
   { EMS_55E,	  	  	 CANMsg18FED800.Msg,  8,	  8,  CAN_MSG_Rx,  CAN_MSG_CYCLE,	 10000,	  0,   &CANMsg18FED800Status,	  CANMsg18FED800Init,    CANMsg18FED800Timeout,   CANMsg18FED800Mask,},
   { EMS_35D,	  	  	 CANMsg18FFC800.Msg,  8,	  8,  CAN_MSG_Rx,  CAN_MSG_CYCLE,	 1000,	  0,   &CANMsg18FFC800Status,	  CANMsg18FFC800Init,    CANMsg18FFC800Timeout,   CANMsg18FFC800Mask,},
   { EMS_51C,	  	  	 CANMsg18FEC600.Msg,  8,	  8,  CAN_MSG_Rx,  CAN_MSG_CYCLE,	 5000,	  0,   &CANMsg18FEC600Status,	  CANMsg18FEC600Init,    CANMsg18FEC600Timeout,   CANMsg18FEC600Mask,},
+  { LLM_EB4E,	  	  	 CANMsg18FFEB4E.Msg,  8,	  8,  CAN_MSG_Rx,  CAN_MSG_CYCLE,	 5000,	  0,   &CANMsg18FFEB4EStatus,	  CANMsg18FFEB4EInit,    CANMsg18FFEB4ETimeout,   CANMsg18FFEB4EMask,},
 	/*==========================================================================================================================================================================*/
 };
 #define   CAN_TX_MSG_NUM                    8
-#define   CAN_RX_MSG_NUM                    42
+#define   CAN_RX_MSG_NUM                    43
 
 #endif

code/Sources/Protocol/src/CAN_Communication_Matrix.c

@@ -228,3 +228,7 @@ volatile uint8_t     CANMsg18FFC800Status;
 //0x18FEC600
 volatile CANMsg18FEC600Union             CANMsg18FEC600;
 volatile uint8_t     CANMsg18FEC600Status;
+
+//LLM_EB4E
+volatile CANMsg18FFEB4EUnion             CANMsg18FFEB4E;
+volatile uint8_t     CANMsg18FFEB4EStatus;

code/Sources/System/src/main.c

@@ -47,6 +47,8 @@
 //20250618 增加唤醒和ingoff->ignon排气制动指示灯控制信号清零
 //V00.13
 //20250621 升级软件版本号
+//V00.14
+//20250730 TYW-2025-00635变更
 
 #include "main.h"
 #include "fuelconfig.h"