Commit 97b3e218 authored by 李冠华's avatar 李冠华

🐞 fix:修改燃油指示灯颜色与变量值的对应关系,使燃油指示灯在自检期间点亮黄色指示灯

parent 2f6966ca
...@@ -64,7 +64,7 @@ uint8_t Get_FuelStatus_Valid(void) ...@@ -64,7 +64,7 @@ uint8_t Get_FuelStatus_Valid(void)
函数名:Get_FuelPilotLamp_Status 函数名:Get_FuelPilotLamp_Status
功 能:获取燃油指示灯状态函数 功 能:获取燃油指示灯状态函数
参 数:无 参 数:无
返回值:LampStatus 0--熄灭,1--白色,2--黄色,3--黄色闪烁 返回值:LampStatus 0--熄灭,1--黄色,2--白色,3--黄色闪烁
****************************************************************************** ******************************************************************************
注 意:该函数必须每 ms被调用一次 注 意:该函数必须每 ms被调用一次
******************************************************************************/ ******************************************************************************/
...@@ -74,7 +74,7 @@ uint8_t Get_FuelPilotLamp_Status(void) ...@@ -74,7 +74,7 @@ uint8_t Get_FuelPilotLamp_Status(void)
if((Fuel.FuelValid == 1U) && (Fuel.FuelSegDis == 1U)) if((Fuel.FuelValid == 1U) && (Fuel.FuelSegDis == 1U))
{ {
LampStatus = 2U; LampStatus = 1U;
} }
else if ((Fuel.FuelValid == 1U) && (Fuel.FuelSegDis == 0U)) else if ((Fuel.FuelValid == 1U) && (Fuel.FuelSegDis == 0U))
{ {
...@@ -82,7 +82,7 @@ uint8_t Get_FuelPilotLamp_Status(void) ...@@ -82,7 +82,7 @@ uint8_t Get_FuelPilotLamp_Status(void)
} }
else if ((Fuel.FuelValid == 1U) && (Fuel.FuelSegDis > 1U)) else if ((Fuel.FuelValid == 1U) && (Fuel.FuelSegDis > 1U))
{ {
LampStatus = 1U; LampStatus = 2U;
} }
else else
{ {
......
...@@ -117,7 +117,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] = ...@@ -117,7 +117,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] =
{em_LED_Fault_Codes_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_Fault_Codes_Judgement, LED_Fault_Codes_Execution }, {em_LED_Fault_Codes_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_Fault_Codes_Judgement, LED_Fault_Codes_Execution },
{em_LED_System_Indicator_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_SystIndicator_R_Judgement, LED_SystIndicator_R_Execution }, {em_LED_System_Indicator_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_SystIndicator_R_Judgement, LED_SystIndicator_R_Execution },
{em_LED_P_GEAR_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_P_GEAR_G_Judgement, LED_P_GEAR_G_Execution }, {em_LED_P_GEAR_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_P_GEAR_G_Judgement, LED_P_GEAR_G_Execution },
{em_LED_Fuel_Alarm_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_Fuel_Alarm_W_Judgement, LED_Fuel_Alarm_W_Execution }, {em_LED_Fuel_Alarm_W, NoSelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_Fuel_Alarm_W_Judgement, LED_Fuel_Alarm_W_Execution },
{em_LED_Charging_Connection_R, SelfCheck, NoExterNalCheck, LED_IGN_ON_OFF, 0u, 1500ul, LED_Charging_Connection_R_Judgement, LED_Charging_Connection_R_Execution }, {em_LED_Charging_Connection_R, SelfCheck, NoExterNalCheck, LED_IGN_ON_OFF, 0u, 1500ul, LED_Charging_Connection_R_Judgement, LED_Charging_Connection_R_Execution },
{em_LED_Power_Battery_Failure_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_Power_Battery_Failure_R_Judgement, LED_Power_Battery_Failure_R_Execution }, {em_LED_Power_Battery_Failure_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 1500ul, LED_Power_Battery_Failure_R_Judgement, LED_Power_Battery_Failure_R_Execution },
}; };
...@@ -207,7 +207,7 @@ static Tellib_uint16_t LED_Fuel_Alarm_Judgement(void) ...@@ -207,7 +207,7 @@ static Tellib_uint16_t LED_Fuel_Alarm_Judgement(void)
{ {
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_1Hz)
{ {
LED_STATE = 2U; LED_STATE = 1U;
} }
else else
{ {
...@@ -222,16 +222,16 @@ static void LED_Fuel_Alarm_Execution(Tellib_uint16_t led_status) ...@@ -222,16 +222,16 @@ static void LED_Fuel_Alarm_Execution(Tellib_uint16_t led_status)
#if (PART_NUMBER == G54_A01) #if (PART_NUMBER == G54_A01)
if (led_status == 1u) if (led_status == 1u)
{ {
/*点亮灯*/ /*点亮灯*/
LED_Driver_Channel_Set(LampChannel_0, LampCh0_23_Fuel_Alarm_Y, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, LampCh0_24_Fuel_Alarm_W, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_24_Fuel_Alarm_W, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_23_Fuel_Alarm_Y, LED_ON);
SEG_SET_LED_STS(SEG_LED_Fuel_Oil, 1U); SEG_SET_LED_STS(SEG_LED_Fuel_Oil, 1U);
} }
else if (led_status == 2u) else if (led_status == 2u)
{ {
/*点亮灯*/ /*点亮灯*/
LED_Driver_Channel_Set(LampChannel_0, LampCh0_24_Fuel_Alarm_W, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, LampCh0_23_Fuel_Alarm_Y, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_23_Fuel_Alarm_Y, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_24_Fuel_Alarm_W, LED_ON);
SEG_SET_LED_STS(SEG_LED_Fuel_Oil, 1U); SEG_SET_LED_STS(SEG_LED_Fuel_Oil, 1U);
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment