Commit 33e78888 authored by 李冠华's avatar 李冠华

🐞 fix:优化ACC OFF下段码的显示功能

parent f70e40eb
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
uint8_t Charge_OFF_Flag = 0; uint8_t Charge_OFF_Flag = 0;
void Clear_Bu98_Conditions(DoNot_Close_Seg_en_t closeType);
void TYW_Clear_Eeprom_Service(void) void TYW_Clear_Eeprom_Service(void)
{ {
#if (PART_NUMBER == RMR42E_60) #if (PART_NUMBER == RMR42E_60)
...@@ -162,20 +164,88 @@ void Clear_Bu98(void) ...@@ -162,20 +164,88 @@ void Clear_Bu98(void)
} }
} }
void Clear_Bu98_Conditions(void) void Clear_Bu98_Conditions(DoNot_Close_Seg_en_t closeType)
{ {
uint8_t i = 0; uint8_t i = 0;
uint8_t transitionData = 0U;
if(closeType == ONLY_TEL)
{
for (i = 0; i < BU98R10_DDRAM_SIZE; i++) for (i = 0; i < BU98R10_DDRAM_SIZE; i++)
{
if(i == 74U)
{
transitionData = ((BU98R10Chip0DDRAM.Byte[75] >> 4U) & 0xFU);
BU98R10Chip0DDRAM.Byte[75] = ((transitionData << 4U) + 0);
transitionData = 0;
}
else
{ {
BU98R10Chip0DDRAM.Byte[i] = 0; BU98R10Chip0DDRAM.Byte[i] = 0;
}
if(i == 46U)
{
transitionData = ((BU98R10Chip1DDRAM.Byte[46]) & 0xFU);
BU98R10Chip1DDRAM.Byte[46] = transitionData;
transitionData = 0;
}
else
{
BU98R10Chip1DDRAM.Byte[i] = 0; BU98R10Chip1DDRAM.Byte[i] = 0;
} }
}
}
else if (closeType == TEL_AND_SOC)
{
for (i = 0; i < BU98R10_DDRAM_SIZE; i++)
{
if((i == 26) || (i == 28) || (i == 74U))
{
transitionData = ((BU98R10Chip0DDRAM.Byte[i] >> 4U) & 0xFU);
BU98R10Chip0DDRAM.Byte[i] = ((transitionData << 4U) + 0);
transitionData = 0;
}
else if ((i == 29U) || (i == 30U) || (i == 31U) || (i == 32U) || (i == 33U) || (i == 34U) || (i == 35U) ||
(i == 60U) || (i == 67U) || (i == 68U) ||(i == 71U) || (i == 72U) || (i == 73U))
{
;
}
else
{
BU98R10Chip0DDRAM.Byte[i] = 0;
}
if(i == 46U)
{
transitionData = ((BU98R10Chip1DDRAM.Byte[46]) & 0xFU);
BU98R10Chip1DDRAM.Byte[46] = transitionData;
transitionData = 0;
}
else
{
BU98R10Chip1DDRAM.Byte[i] = 0;
}
}
}
else
{
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;
#if(PART_NUMBER == G54_A01)
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() == KEY_ACC))
#else
if (Common_Get_IG_Sts() == COMMON_POWER_ON) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
#endif
{ {
if ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != POWER_CHECK_NULL)) if ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != POWER_CHECK_NULL))
{ {
...@@ -241,13 +311,15 @@ void Gauge_Service(void) ...@@ -241,13 +311,15 @@ void Gauge_Service(void)
{ {
Gauge_Power_SOC_pull_Display(); Gauge_Power_SOC_pull_Display();
Gauge_EleDial_AllSOC_Display(); Gauge_EleDial_AllSOC_Display();
Clear_Bu98_Conditions(TEL_AND_SOC);
} }
else else
{ {
// Clear_Bu98(); Clear_Bu98_Conditions(ONLY_TEL);
}
for (i = 0; i < LampCh0_MAX; i++) for (i = 0; i < LampCh0_MAX; i++)
{ {
if ((i == em_LED_Battery_Charging_W) || (i == em_LED_Charging_Connection_R)) if ((i == LampCh0_08_Battery_Charging_W) || (i == LampCh0_32_Charging_Connection_R))
{ {
; ;
} }
...@@ -256,7 +328,6 @@ void Gauge_Service(void) ...@@ -256,7 +328,6 @@ void Gauge_Service(void)
LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
} }
} }
}
#else #else
Clear_Bu98(); Clear_Bu98();
interact_PWM_Low_Duty = 100; interact_PWM_Low_Duty = 100;
......
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
#define EEPROM_BLOCK_00 0 #define EEPROM_BLOCK_00 0
typedef enum
{
ONLY_TEL, /*只保持充电中指示灯和充电线不连接指示灯不关闭*/
TEL_AND_SOC, /*保持充电中指示灯和充电线不连接指示灯以及电量表和总电量值显示不关闭*/
}DoNot_Close_Seg_en_t;
typedef struct typedef struct
{ {
uint16_t value; uint16_t value;
......
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