Commit f70e40eb authored by 李冠华's avatar 李冠华

feat:混动车型增加ACC为0时,下电显示充电界面和充电进行中指示灯和充电线连接指示灯

parent 1ea77137
...@@ -56,7 +56,18 @@ uint8_t Get_BackLight_En(void) ...@@ -56,7 +56,18 @@ uint8_t Get_BackLight_En(void)
} }
else else
{ {
#if(PART_NUMBER == G54_A01)
if ((Get_CAN_Power_State() == PKEY_ON) && (Get_Soc1_Valid() == 1U))
{
return 1;
}
else
{
return 0;
}
#else
return 0; return 0;
#endif
} }
} }
/** /**
......
...@@ -162,6 +162,16 @@ void Clear_Bu98(void) ...@@ -162,6 +162,16 @@ void Clear_Bu98(void)
} }
} }
void Clear_Bu98_Conditions(void)
{
uint8_t i = 0;
for (i = 0; i < BU98R10_DDRAM_SIZE; i++)
{
BU98R10Chip0DDRAM.Byte[i] = 0;
BU98R10Chip1DDRAM.Byte[i] = 0;
}
}
void Gauge_Service(void) void Gauge_Service(void)
{ {
uint8_t i = 0; uint8_t i = 0;
...@@ -226,12 +236,35 @@ void Gauge_Service(void) ...@@ -226,12 +236,35 @@ void Gauge_Service(void)
} }
else else
{ {
#if(PART_NUMBER == G54_A01)
if ((Get_CAN_Power_State() == PKEY_ON) && (Get_Soc1_Valid() == 1U))
{
Gauge_Power_SOC_pull_Display();
Gauge_EleDial_AllSOC_Display();
}
else
{
// Clear_Bu98();
for (i = 0; i < LampCh0_MAX; i++)
{
if ((i == em_LED_Battery_Charging_W) || (i == em_LED_Charging_Connection_R))
{
;
}
else
{
LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
}
}
}
#else
Clear_Bu98(); Clear_Bu98();
interact_PWM_Low_Duty = 100; interact_PWM_Low_Duty = 100;
for (i = 0; i < LampCh0_MAX; i++) for (i = 0; i < LampCh0_MAX; i++)
{ {
LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
} }
#endif
} }
} }
......
...@@ -125,6 +125,7 @@ static void Power_IG_ON_Init(void) ...@@ -125,6 +125,7 @@ static void Power_IG_ON_Init(void)
LED_Driver_Service_Immediate(); LED_Driver_Service_Immediate();
Fault_Code_KL15_Init(); Fault_Code_KL15_Init();
Data_Time_KL15_Init(); Data_Time_KL15_Init();
Data_Soc_KL15_Init();
} }
static void Power_Sleep_Init(void) static void Power_Sleep_Init(void)
......
...@@ -102,7 +102,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] = ...@@ -102,7 +102,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] =
{em_LED_READY_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_READY_Judgement, LED_READY_Execution }, {em_LED_READY_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_READY_Judgement, LED_READY_Execution },
{em_LED_Seat_Detection_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Seat_Detection_Judgement, LED_Seat_Detection_Execution }, {em_LED_Seat_Detection_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Seat_Detection_Judgement, LED_Seat_Detection_Execution },
{em_LED_Key_Access_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Key_Access_Judgement, LED_Key_Access_Execution }, {em_LED_Key_Access_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Key_Access_Judgement, LED_Key_Access_Execution },
{em_LED_Battery_Charging_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Battery_Charging_Judgement, LED_Battery_Charging_Execution }, {em_LED_Battery_Charging_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON_OFF, 0u, 3000ul, LED_Battery_Charging_Judgement, LED_Battery_Charging_Execution },
{em_LED_Cutterhead_Switch_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cutterhead_Switch_Judgement, LED_Cutterhead_Switch_Execution }, {em_LED_Cutterhead_Switch_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cutterhead_Switch_Judgement, LED_Cutterhead_Switch_Execution },
{em_LED_GEAR_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_GEAR_Judgement, LED_GEAR_Execution }, {em_LED_GEAR_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_GEAR_Judgement, LED_GEAR_Execution },
{em_LED_External_Discharge_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_External_Discharge_Judgement, LED_External_Discharge_Execution }, {em_LED_External_Discharge_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_External_Discharge_Judgement, LED_External_Discharge_Execution },
...@@ -118,7 +118,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] = ...@@ -118,7 +118,7 @@ const LED_Attribute_st LED_Attribute[LED_Max] =
{em_LED_System_Indicator_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_SystIndicator_R_Judgement, LED_SystIndicator_R_Execution }, {em_LED_System_Indicator_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_SystIndicator_R_Judgement, LED_SystIndicator_R_Execution },
{em_LED_P_GEAR_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_P_GEAR_G_Judgement, LED_P_GEAR_G_Execution }, {em_LED_P_GEAR_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_P_GEAR_G_Judgement, LED_P_GEAR_G_Execution },
{em_LED_Fuel_Alarm_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Alarm_W_Judgement, LED_Fuel_Alarm_W_Execution }, {em_LED_Fuel_Alarm_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Alarm_W_Judgement, LED_Fuel_Alarm_W_Execution },
{em_LED_Charging_Connection_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Charging_Connection_R_Judgement, LED_Charging_Connection_R_Execution }, {em_LED_Charging_Connection_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON_OFF, 0u, 3000ul, LED_Charging_Connection_R_Judgement, LED_Charging_Connection_R_Execution },
{em_LED_Power_Battery_Failure_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Power_Battery_Failure_R_Judgement, LED_Power_Battery_Failure_R_Execution }, {em_LED_Power_Battery_Failure_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Power_Battery_Failure_R_Judgement, LED_Power_Battery_Failure_R_Execution },
}; };
......
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