Commit 8ec07281 authored by 梁百峰's avatar 梁百峰

feat:修改背光逻辑,白天黑夜模式亮度分开显示

parent a52e3ddb
...@@ -9,6 +9,7 @@ uint8_t DataESpeedValid ; ...@@ -9,6 +9,7 @@ uint8_t DataESpeedValid ;
#pragma ghs section bss = ".myNonInitArea" #pragma ghs section bss = ".myNonInitArea"
_Light g_Light; _Light g_Light;
_Light g_nightLight;
uint32_t PowerIgnOnTimeLine = 0; uint32_t PowerIgnOnTimeLine = 0;
uint32_t PowerIgnOffTimeLine = 0; uint32_t PowerIgnOffTimeLine = 0;
#pragma ghs section bss = default #pragma ghs section bss = default
...@@ -1192,6 +1193,7 @@ void GUI_Sound_Init(void) ...@@ -1192,6 +1193,7 @@ void GUI_Sound_Init(void)
void GUI_Light_Init(void) void GUI_Light_Init(void)
{ {
g_Light.Duty = 450; g_Light.Duty = 450;
g_nightLight.Duty = 100;
} }
void Gui_LightProc(void) void Gui_LightProc(void)
...@@ -1255,25 +1257,26 @@ void Gui_LightProc(void) ...@@ -1255,25 +1257,26 @@ void Gui_LightProc(void)
} }
else else
{ {
if(Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_TelltalesLedSts(m_LED_High_Lamp) == 1))
{ {
PWM_Channel_Set_Duty(1, g_Light.Duty);//表盘 PWM_Channel_Set_Duty(1, g_nightLight.Duty);//表盘
PWM_Channel_Set_Duty(3, g_Light.Duty);//指针 PWM_Channel_Set_Duty(3, g_nightLight.Duty);//指针
PWM_Channel_Set_Duty(5, 200);//3.5 PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5
} }
else//close lamp else//close lamp
{ {
PWM_Channel_Set_Duty(5, 500);//3.5 PWM_Channel_Set_Duty(5, g_Light.Duty);//3.5
if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_SET_Backlight) // if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_SET_Backlight)
{ // {
PWM_Channel_Set_Duty(1, g_Light.Duty);//表盘 PWM_Channel_Set_Duty(1, g_Light.Duty);//表盘
PWM_Channel_Set_Duty(3, g_Light.Duty);//指针 PWM_Channel_Set_Duty(3, g_Light.Duty);//指针
} // }
else // else
{ // {
PWM_Channel_Set_Duty(1, 0);//表盘 // PWM_Channel_Set_Duty(1, 0);//表盘
PWM_Channel_Set_Duty(3, 0);//指针 // PWM_Channel_Set_Duty(3, 0);//指针
} // }
} }
} }
} }
...@@ -1281,7 +1284,15 @@ void Gui_LightProc(void) ...@@ -1281,7 +1284,15 @@ void Gui_LightProc(void)
{ {
if((Pop_Alarm_Get_Current() == POP_ALARM_POSITION_LIGHT)||(Pop_Alarm_Get_Current() == POP_ALARM_KEY)) if((Pop_Alarm_Get_Current() == POP_ALARM_POSITION_LIGHT)||(Pop_Alarm_Get_Current() == POP_ALARM_KEY))
{ {
PWM_Channel_Set_Duty(5, 500);//3.5 if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_TelltalesLedSts(m_LED_High_Lamp) == 1))
{
PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5
}
else
{
PWM_Channel_Set_Duty(5, g_Light.Duty);//3.5
}
} }
else else
{ {
...@@ -1291,7 +1302,15 @@ void Gui_LightProc(void) ...@@ -1291,7 +1302,15 @@ void Gui_LightProc(void)
} }
else else
{ {
PWM_Channel_Set_Duty(5, 500);//3.5 if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_TelltalesLedSts(m_LED_High_Lamp) == 1))
{
PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5
}
else
{
PWM_Channel_Set_Duty(5, g_Light.Duty);//3.5
}
} }
} }
PWM_Channel_Set_Duty(1, 0);//表盘 PWM_Channel_Set_Duty(1, 0);//表盘
......
...@@ -270,6 +270,7 @@ typedef struct ...@@ -270,6 +270,7 @@ typedef struct
uint8_t LightCn; uint8_t LightCn;
} _Light; } _Light;
extern _Light g_nightLight;
extern _Light g_Light; extern _Light g_Light;
typedef struct typedef struct
......
...@@ -304,8 +304,30 @@ void Menu_Logic_Operation_SET_Backlight(Menu_Key_en_t enKeyType) ...@@ -304,8 +304,30 @@ void Menu_Logic_Operation_SET_Backlight(Menu_Key_en_t enKeyType)
{ {
updataDir = 1; updataDir = 1;
datmax = 500u; datmax = 500u;
datmin = 150u; datmin = 100u;
Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 50u, (uint16_t*)&(g_Light.Duty)); if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_TelltalesLedSts(m_LED_High_Lamp) == 1))
{
if(g_nightLight.Duty == 100u)
{
Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 100u, (uint16_t*)&(g_nightLight.Duty));
}
else
{
Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 50u, (uint16_t*)&(g_nightLight.Duty));
}
}
else
{
if(g_Light.Duty == 100u)
{
Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 100u, (uint16_t*)&(g_Light.Duty));
}
else
{
Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 50u, (uint16_t*)&(g_Light.Duty));
}
}
} }
else if(enKeyType == MENU_KEY_TIMEOUT) else if(enKeyType == MENU_KEY_TIMEOUT)
{ {
......
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