增加报警指示灯

le21_fuel/Sources/Part_3/CAN_CH0_CAN_Communication_Matrix.c

@@ -955,7 +955,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         (( void * )0),
         (( void * )0),
         (( void * )0),
-    },
+    },*/
     {
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
@@ -966,7 +966,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         (( void * )0),
         (( void * )0),
     },
-    {
+    /*{
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
@@ -2438,7 +2438,7 @@ uint8_t  Get_CAN_CH0_ID_18FA02EF_Sig_MCU_MotorTempHighAlarm(void)
 /*uint8_t  Get_CAN_CH0_ID_18FA63D5_Sig_HFCU_ConductHigh(void)
 {
     return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_HFCU_18FA63D5_Msg_Count, 4u) >> 0u) & 0x03u));
-}
+}*/
 
 uint8_t  Get_CAN_CH0_ID_18FA98D0_Sig_PMS_EngMaintanceFlag(void)
 {
@@ -2456,7 +2456,7 @@ uint16_t Get_CAN_CH0_ID_18FA98D0_Sig_PMS_EngServiceMaintainInterval(void)
     ((uint16_t)((uint16_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_PMS_18FA98D0_Msg_Count, 2u) >> 0u) & 0xFFu));
 }
 
-uint8_t  Get_CAN_CH0_ID_0CFFB303_Sig_TCU_PTO_Fault(void)
+/*uint8_t  Get_CAN_CH0_ID_0CFFB303_Sig_TCU_PTO_Fault(void)
 {
     return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_TCU_0CFFB303_Msg_Count, 6u) >> 6u) & 0x03u));
 }*/

le21_fuel/Sources/Part_3/CAN_CH0_CAN_Communication_Matrix.h

@@ -72,9 +72,9 @@ typedef enum
     CAN_CH0_ID_BMS_18FA41F4_Msg_Count,
     CAN_CH0_ID_MMI_18FF4A41_Msg_Count,
     CAN_CH0_ID_MCU_18FA02EF_Msg_Count,
-    /*CAN_CH0_ID_HFCU_18FA63D5_Msg_Count,
+    //CAN_CH0_ID_HFCU_18FA63D5_Msg_Count,
     CAN_CH0_ID_PMS_18FA98D0_Msg_Count,
-    CAN_CH0_ID_TCU_0CFFB303_Msg_Count,*/
+    //CAN_CH0_ID_TCU_0CFFB303_Msg_Count,*/
     CAN_CH0_ID_PMS_18FA1727_Msg_Count,
 
     CAN_CH0_ID_TBOX_18FF649F_Msg_Count,
@@ -171,9 +171,9 @@ extern const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL]
 #define  CAN_CH0_ID_BMS_18FA41F4_Msg                0x18FA41F4ul
 #define  CAN_CH0_ID_MMI_18FF4A41_Msg                0x18FF4A41ul
 #define  CAN_CH0_ID_MCU_18FA02EF_Msg                0x18FA02EFul
-/*#define  CAN_CH0_ID_HFCU_18FA63D5_Msg               0x18FA63D5ul
+//#define  CAN_CH0_ID_HFCU_18FA63D5_Msg               0x18FA63D5ul
 #define  CAN_CH0_ID_PMS_18FA98D0_Msg                0x18FA98D0ul
-#define  CAN_CH0_ID_TCU_0CFFB303_Msg                0x0CFFB303ul*/
+/*#define  CAN_CH0_ID_TCU_0CFFB303_Msg                0x0CFFB303ul*/
 #define  CAN_CH0_ID_PMS_18FA1727_Msg                0x18FA1727ul
 
 #define  CAN_CH0_ID_TBOX_18FF649F_Msg               0x18FF649Ful
@@ -446,11 +446,11 @@ extern uint8_t  Get_CAN_CH0_ID_18FF4A41_Sig_MMI_LeftSwStatus(void);
 extern uint8_t  Get_CAN_CH0_ID_18FF4A41_Sig_MMI_RightSwStatus(void);
 extern uint8_t  Get_CAN_CH0_ID_18FA02EF_Sig_MCU_MotorFltLevel(void);
 extern uint8_t  Get_CAN_CH0_ID_18FA02EF_Sig_MCU_MotorTempHighAlarm(void);
-/*extern uint8_t  Get_CAN_CH0_ID_18FA63D5_Sig_HFCU_ConductHigh(void);
+//extern uint8_t  Get_CAN_CH0_ID_18FA63D5_Sig_HFCU_ConductHigh(void);
 extern uint8_t  Get_CAN_CH0_ID_18FA98D0_Sig_PMS_EngMaintanceFlag(void);
 extern uint8_t  Get_CAN_CH0_ID_18FA98D0_Sig_PMS_EngMaintainWarningSts(void);
 extern uint16_t Get_CAN_CH0_ID_18FA98D0_Sig_PMS_EngServiceMaintainInterval(void);
-extern uint8_t  Get_CAN_CH0_ID_0CFFB303_Sig_TCU_PTO_Fault(void);*/
+/*extern uint8_t  Get_CAN_CH0_ID_0CFFB303_Sig_TCU_PTO_Fault(void);*/
 extern uint8_t  Get_CAN_CH0_ID_18FA1727_Sig_PMS_SpdLmtLevelReq(void);
 extern uint8_t  Get_CAN_CH0_ID_18FF649F_Sig_TBOX_AnnualViolationPro(void);
 extern uint8_t  Get_CAN_CH0_ID_18FF649F_Sig_TBOX_EthAbnormalPrompt(void);

le21_fuel/Sources/Part_5/Telltales.c

@@ -1323,7 +1323,35 @@ void Maint_Lamp(void)
 	}
 	else
 	{
-		LED_Driver_Channel_Set(Channel_1, LampCh1_Maint, Lamp_Off);
+		if((Val_EOL_F110_EMS() == 1)&&(Val_EOL_F101_ServiceMaintain() == 2))
+		{
+			if (g_u8SelfLampTimes < LED_SELF_CHECK_TIME)
+			{
+				LED_Driver_Channel_Set(Channel_1, LampCh1_Maint, Lamp_On);	
+			}
+			else
+			{
+				if (SYS_OPR_STAT_IGN_ON)
+				{
+					//if()
+					//{
+					//	LED_Driver_Channel_Set(Channel_1, LampCh1_Maint, Lamp_On);
+					//}
+					//else
+					//{
+					//	LED_Driver_Channel_Set(Channel_1, LampCh1_Maint, Lamp_Off);
+					//}
+				}
+				else
+				{
+					LED_Driver_Channel_Set(Channel_1, LampCh1_Maint, Lamp_Off);
+				}
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_1, LampCh1_Maint, Lamp_Off);
+		}
 	}
 }
 
@@ -1964,7 +1992,167 @@ void Vehicle_Online_Sta_Lamp(void)//����
 
 
 
+	void Oil_Low_Warning_Lamp(void)
+	{
+		if((Val_EOL_F101_ConfigType() == 1)||(Val_EOL_F101_ConfigType() == 3)||(Val_EOL_F101_ConfigType() == 4)||(Val_EOL_F101_ConfigType() == 6))
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+				
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_0, LampCh0_Oillow, Lamp_Off);
+			}
+		}
+		else 
+		{
+			LED_Driver_Channel_Set(Channel_0, LampCh0_Oillow, Lamp_Off);
+		}
+	}
 
+	void Coolant_TempHigh_Lamp(void)
+	{
+		if((Val_EOL_F101_ConfigType() == 1)||(Val_EOL_F101_ConfigType() == 3)||(Val_EOL_F101_ConfigType() == 4)||(Val_EOL_F101_ConfigType() == 6))
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+				
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_0, LampCh1_CooltLiquid_High, Lamp_Off);
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_0, LampCh1_CooltLiquid_High, Lamp_Off);
+		}
+	}
+	void OilPressure_Low_Lamp(void)
+	{
+		if(Val_EOL_F110_EMS() == 1)
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+				
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_0, LampCh0_EngOilPress, Lamp_Off);
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_0, LampCh0_EngOilPress, Lamp_Off);
+		}
+	}
+	void Engine_Sys_Fault_Lamp(void)
+	{
+		if(Val_EOL_F110_EMS() == 1)
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_1, LampCh1_Engine_System_Failt, Lamp_Off);
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_1, LampCh1_Engine_System_Failt, Lamp_Off);
+		}
+	}
+
+	void Engine_Emission_Fault_Lamp(void)
+	{
+		if((Val_EOL_F110_EMS() == 1)&&((Val_EOL_F101_EmissionsStandards() == 1)||(Val_EOL_F101_EmissionsStandards() == 1)))
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+				//if (CAN_MSG_Status(CAN_CH0, ) == CAN_MSG_LOST)
+				//{
+				//	
+				//}
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_1, LampCh1_Engine_Emission_Failt, Lamp_Off);
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_1, LampCh1_Engine_Emission_Failt, Lamp_Off);
+		}
+	}
+
+	void ASR_Lamp(void)
+	{
+		if ((Val_EOL_F101_ASR() == 2)&&(Val_EOL_F101_BrakeSupplier() == 1))
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+				if (CAN_MSG_Status(CAN_CH0, CAN_CH0_ID_ABS_EBS_EBC1_Msg_Count) == CAN_MSG_LOST)
+				{
+					LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Lamp, Lamp_Off);
+				}
+				else
+				{
+					if((Get_CAN_CH0_ID_18F0010B_Sig_EBS_ASREngineControlActive() == 1) && (Get_CAN_CH0_ID_18F0010B_Sig_EBS_ASR_Off_RoadSwitch() == 0))
+					{
+						LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Lamp, Lamp_Blink_1Hz);
+					}
+					else
+					{
+						LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Lamp, Lamp_Off);
+					}
+				}
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Lamp, Lamp_Off);
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Lamp, Lamp_Off);
+		}
+	}
+
+	void ASR_Off_Lamp(void)
+	{
+		if (Val_EOL_F101_ASR() == 2)
+		{
+			if (SYS_OPR_STAT_IGN_ON)
+			{
+				if (CAN_MSG_Status(CAN_CH0, CAN_CH0_ID_ABS_EBS_EBC1_Msg_Count) == CAN_MSG_LOST)
+				{
+					LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Off, Lamp_Off);
+				}
+				else
+				{
+					if (Get_CAN_CH0_ID_18F0010B_Sig_EBS_ASR_Off_RoadSwitch() == 1)
+					{
+						LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Off, Lamp_On);
+					}
+					else
+					{
+						LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Off, Lamp_Off);
+					}
+				}
+			}
+			else
+			{
+				LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Off, Lamp_Off);
+			}
+		}
+		else
+		{
+			LED_Driver_Channel_Set(Channel_1, LampCh1_ASR_Off, Lamp_Off);
+		}
+	}
 
 
 
@@ -4118,9 +4306,13 @@ void Lamp_Management_Service(void)
 	//TBOX����״̬
  	Vehicle_Online_Sta_Lamp();
 
-
-
-
+	Oil_Low_Warning_Lamp();
+	Coolant_TempHigh_Lamp();
+	OilPressure_Low_Lamp();
+	Engine_Sys_Fault_Lamp();
+	Engine_Emission_Fault_Lamp();
+	ASR_Lamp();
+	ASR_Off_Lamp();
 	#if 0
 	//���س��״ָ̬ʾ��
 	BatteryCharge_Lamp();