Skip to content

I
IVECO_NS216
Commit bd4944b9 authored by 高士达's avatar 高士达
Browse files
Options

Merge branch 'liang_buf' into '依维柯216变更后' 

✨ feat:修改亮度占空比，亮度百分比外发

See merge request !38
parents ecedbcc0 88100195
Hide whitespace changes
Inline Side-by-side
Showing with 240 additions and 114 deletions
source/Appliciation/CAN_App/CAN_APP.c
View file @ bd4944b9
...@@ -539,35 +539,35 @@ void Can_Set_Buff_18D00017(canlib_uint8_t CopyData []) ...@@ -539,35 +539,35 @@ void Can_Set_Buff_18D00017(canlib_uint8_t CopyData [])
{ {
if(g_nightLight.Duty == 150) if(g_nightLight.Duty == 150)
{ {
IC_ILLUMINATION = 15; IC_ILLUMINATION = 20;
} }
else if(g_nightLight.Duty == 250) else if(g_nightLight.Duty == 250)
{ {
IC_ILLUMINATION = 25; IC_ILLUMINATION = 35;
} }
else if(g_nightLight.Duty == 350) else if(g_nightLight.Duty == 350)
{ {
IC_ILLUMINATION = 35; IC_ILLUMINATION = 45;
} }
else if(g_nightLight.Duty == 450) else if(g_nightLight.Duty == 450)
{ {
IC_ILLUMINATION = 45; IC_ILLUMINATION = 55;
} }
else if(g_nightLight.Duty == 550) else if(g_nightLight.Duty == 550)
{ {
IC_ILLUMINATION = 55; IC_ILLUMINATION = 65;
} }
else if(g_nightLight.Duty == 650) else if(g_nightLight.Duty == 650)
{ {
IC_ILLUMINATION = 65; IC_ILLUMINATION = 85;
} }
else if(g_nightLight.Duty == 750) else if(g_nightLight.Duty == 750)
{ {
IC_ILLUMINATION = 75; IC_ILLUMINATION = 90;
} }
else if(g_nightLight.Duty == 850) else if(g_nightLight.Duty == 850)
{ {
IC_ILLUMINATION = 85; IC_ILLUMINATION = 100;
} }
else else
{ {
...@@ -578,35 +578,35 @@ void Can_Set_Buff_18D00017(canlib_uint8_t CopyData []) ...@@ -578,35 +578,35 @@ void Can_Set_Buff_18D00017(canlib_uint8_t CopyData [])
{ {
if(g_Light.Duty == 150) if(g_Light.Duty == 150)
{ {
IC_ILLUMINATION = 15; IC_ILLUMINATION = 20;
} }
else if(g_Light.Duty == 250) else if(g_Light.Duty == 250)
{ {
IC_ILLUMINATION = 25; IC_ILLUMINATION = 35;
} }
else if(g_Light.Duty == 350) else if(g_Light.Duty == 350)
{ {
IC_ILLUMINATION = 35; IC_ILLUMINATION = 45;
} }
else if(g_Light.Duty == 450) else if(g_Light.Duty == 450)
{ {
IC_ILLUMINATION = 45; IC_ILLUMINATION = 55;
} }
else if(g_Light.Duty == 550) else if(g_Light.Duty == 550)
{ {
IC_ILLUMINATION = 55; IC_ILLUMINATION = 65;
} }
else if(g_Light.Duty == 650) else if(g_Light.Duty == 650)
{ {
IC_ILLUMINATION = 65; IC_ILLUMINATION = 85;
} }
else if(g_Light.Duty == 750) else if(g_Light.Duty == 750)
{ {
IC_ILLUMINATION = 75; IC_ILLUMINATION = 90;
} }
else if(g_Light.Duty == 850) else if(g_Light.Duty == 850)
{ {
IC_ILLUMINATION = 85; IC_ILLUMINATION = 100;
} }
else else
{ {
......
source/Appliciation/DataProcess.c
View file @ bd4944b9
...@@ -1247,61 +1247,53 @@ void Gui_LightProc(void) ...@@ -1247,61 +1247,53 @@ void Gui_LightProc(void)
} }
else if(DiagBackLight == 1) else if(DiagBackLight == 1)
{ {
PWM_Channel_Set_Duty(1, 150);//表盘 PWM_Channel_Set_Duty(3, 200);//指针
PWM_Channel_Set_Duty(1, 200);//表盘
PWM_Channel_Set_Duty(5, 150);//3.5 PWM_Channel_Set_Duty(5, 150);//3.5
PWM_Channel_Set_Duty(3, 50);//指针
} }
else if(DiagBackLight == 2) else if(DiagBackLight == 2)
{
PWM_Channel_Set_Duty(1, 250);//表盘
PWM_Channel_Set_Duty(5, 250);//3.5
PWM_Channel_Set_Duty(3, 175);//指针
}
else if(DiagBackLight == 3)
{ {
PWM_Channel_Set_Duty(1, 350);//表盘 PWM_Channel_Set_Duty(1, 350);//表盘
PWM_Channel_Set_Duty(5, 350);//3.5 PWM_Channel_Set_Duty(3, 300);//指针
PWM_Channel_Set_Duty(3, 200);//指针 PWM_Channel_Set_Duty(5, 280);//3.5
} }
else if(DiagBackLight == 4) else if(DiagBackLight == 3)
{ {
PWM_Channel_Set_Duty(1, 450);//表盘 PWM_Channel_Set_Duty(1, 450);//表盘
PWM_Channel_Set_Duty(5, 450);//3.5 PWM_Channel_Set_Duty(3, 450);//指针
PWM_Channel_Set_Duty(3, 275);//指针 PWM_Channel_Set_Duty(5, 400);//3.5
} }
else if(DiagBackLight == 5) else if(DiagBackLight == 4)
{ {
PWM_Channel_Set_Duty(1, 550);//表盘 PWM_Channel_Set_Duty(1, 550);//表盘
PWM_Channel_Set_Duty(3, 550);//指针
PWM_Channel_Set_Duty(5, 550);//3.5 PWM_Channel_Set_Duty(5, 550);//3.5
PWM_Channel_Set_Duty(3, 350);//指针
} }
else if(DiagBackLight == 6) else if(DiagBackLight == 5)
{ {
PWM_Channel_Set_Duty(1, 650);//表盘 PWM_Channel_Set_Duty(1, 650);//表盘
PWM_Channel_Set_Duty(3, 650);//指针
PWM_Channel_Set_Duty(5, 650);//3.5 PWM_Channel_Set_Duty(5, 650);//3.5
PWM_Channel_Set_Duty(3, 400);//指针 }
else if(DiagBackLight == 6)
{
PWM_Channel_Set_Duty(1, 850);//表盘
PWM_Channel_Set_Duty(3, 850);//指针
PWM_Channel_Set_Duty(5, 780);//3.5
} }
else if(DiagBackLight == 7) else if(DiagBackLight == 7)
{ {
PWM_Channel_Set_Duty(1, 750);//表盘 PWM_Channel_Set_Duty(1, 900);//表盘
PWM_Channel_Set_Duty(5, 750);//3.5 PWM_Channel_Set_Duty(3, 900);//指针
PWM_Channel_Set_Duty(3, 450);//指针 PWM_Channel_Set_Duty(5, 900);//3.5
} }
else else
{ {
if(DiagBackLight == 8) if(DiagBackLight == 8)
{ {
PWM_Channel_Set_Duty(1, 850);//表盘 PWM_Channel_Set_Duty(1, 1000);//表盘
PWM_Channel_Set_Duty(5, 850);//3.5 PWM_Channel_Set_Duty(3, 1000);//指针
PWM_Channel_Set_Duty(3, 500);//指针 PWM_Channel_Set_Duty(5, 1000);//3.5
} }
} }
} }
...@@ -1309,77 +1301,100 @@ void Gui_LightProc(void) ...@@ -1309,77 +1301,100 @@ void Gui_LightProc(void)
{ {
if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_Enter_night_mode_sta() == 1)) if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_Enter_night_mode_sta() == 1))
{ {
PWM_Channel_Set_Duty(1, g_nightLight.Duty);//表盘
PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5
switch (g_nightLight.Duty) switch (g_nightLight.Duty)
{ {
case 150: case 150:
PWM_Channel_Set_Duty(3, 50);//指针 PWM_Channel_Set_Duty(3, 200);//指针
break; PWM_Channel_Set_Duty(1, 200);//表盘
case 250: PWM_Channel_Set_Duty(5, 150);//3.5
PWM_Channel_Set_Duty(3, 175);//指针 break;
break; case 250:
case 350: PWM_Channel_Set_Duty(1, 350);//表盘
PWM_Channel_Set_Duty(3, 200);//指针 PWM_Channel_Set_Duty(3, 300);//指针
break; PWM_Channel_Set_Duty(5, 280);//3.5
case 450: break;
PWM_Channel_Set_Duty(3, 275);//指针 case 350:
break; PWM_Channel_Set_Duty(1, 450);//表盘
case 550: PWM_Channel_Set_Duty(3, 450);//指针
PWM_Channel_Set_Duty(3, 350);//指针 PWM_Channel_Set_Duty(5, 400);//3.5
break; break;
case 650: case 450:
PWM_Channel_Set_Duty(3, 400);//指针 PWM_Channel_Set_Duty(1, 550);//表盘
break; PWM_Channel_Set_Duty(3, 550);//指针
case 750: PWM_Channel_Set_Duty(5, 550);//3.5
PWM_Channel_Set_Duty(3, 450);//指针 break;
break; case 550:
case 850: PWM_Channel_Set_Duty(1, 650);//表盘
PWM_Channel_Set_Duty(3, 500);//指针 PWM_Channel_Set_Duty(3, 650);//指针
break; PWM_Channel_Set_Duty(5, 650);//3.5
default: break;
break; case 650:
PWM_Channel_Set_Duty(1, 850);//表盘
PWM_Channel_Set_Duty(3, 850);//指针
PWM_Channel_Set_Duty(5, 780);//3.5
break;
case 750:
PWM_Channel_Set_Duty(1, 900);//表盘
PWM_Channel_Set_Duty(3, 900);//指针
PWM_Channel_Set_Duty(5, 900);//3.5
break;
case 850:
PWM_Channel_Set_Duty(1, 1000);//表盘
PWM_Channel_Set_Duty(3, 1000);//指针
PWM_Channel_Set_Duty(5, 1000);//3.5
break;
default:
break;
} }
} }
else//close lamp else//close lamp
{ {
PWM_Channel_Set_Duty(5, g_Light.Duty);//3.5
// if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_SET_Backlight)
// {
PWM_Channel_Set_Duty(1, g_Light.Duty);//表盘
switch (g_Light.Duty) switch (g_Light.Duty)
{ {
case 150: case 150:
PWM_Channel_Set_Duty(3, 50);//指针 PWM_Channel_Set_Duty(3, 200);//指针
break; PWM_Channel_Set_Duty(1, 200);//表盘
case 250: PWM_Channel_Set_Duty(5, 150);//3.5
PWM_Channel_Set_Duty(3, 175);//指针 break;
break; case 250:
case 350: PWM_Channel_Set_Duty(1, 350);//表盘
PWM_Channel_Set_Duty(3, 200);//指针 PWM_Channel_Set_Duty(3, 300);//指针
break; PWM_Channel_Set_Duty(5, 280);//3.5
case 450: break;
PWM_Channel_Set_Duty(3, 275);//指针 case 350:
break; PWM_Channel_Set_Duty(1, 450);//表盘
case 550: PWM_Channel_Set_Duty(3, 450);//指针
PWM_Channel_Set_Duty(3, 350);//指针 PWM_Channel_Set_Duty(5, 400);//3.5
break; break;
case 650: case 450:
PWM_Channel_Set_Duty(3, 400);//指针 PWM_Channel_Set_Duty(1, 550);//表盘
break; PWM_Channel_Set_Duty(3, 550);//指针
case 750: PWM_Channel_Set_Duty(5, 550);//3.5
PWM_Channel_Set_Duty(3, 450);//指针 break;
break; case 550:
case 850: PWM_Channel_Set_Duty(1, 650);//表盘
PWM_Channel_Set_Duty(3, 500);//指针 PWM_Channel_Set_Duty(3, 650);//指针
break; PWM_Channel_Set_Duty(5, 650);//3.5
default: break;
break; case 650:
PWM_Channel_Set_Duty(1, 850);//表盘
PWM_Channel_Set_Duty(3, 850);//指针
PWM_Channel_Set_Duty(5, 780);//3.5
break;
case 750:
PWM_Channel_Set_Duty(1, 900);//表盘
PWM_Channel_Set_Duty(3, 900);//指针
PWM_Channel_Set_Duty(5, 900);//3.5
break;
case 850:
PWM_Channel_Set_Duty(1, 1000);//表盘
PWM_Channel_Set_Duty(3, 1000);//指针
PWM_Channel_Set_Duty(5, 1000);//3.5
break;
default:
break;
} }
// } // }
// else // else
// { // {
...@@ -1395,13 +1410,69 @@ void Gui_LightProc(void) ...@@ -1395,13 +1410,69 @@ void Gui_LightProc(void)
{ {
if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_Enter_night_mode_sta() == 1)) if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_Enter_night_mode_sta() == 1))
{ {
PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5 switch (g_nightLight.Duty)
{
case 150:
PWM_Channel_Set_Duty(5, 150);//3.5
break;
case 250:
PWM_Channel_Set_Duty(5, 280);//3.5
break;
case 350:
PWM_Channel_Set_Duty(5, 400);//3.5
break;
case 450:
PWM_Channel_Set_Duty(5, 550);//3.5
break;
case 550:
PWM_Channel_Set_Duty(5, 650);//3.5
break;
case 650:
PWM_Channel_Set_Duty(5, 780);//3.5
break;
case 750:
PWM_Channel_Set_Duty(5, 900);//3.5
break;
case 850:
PWM_Channel_Set_Duty(5, 1000);//3.5
break;
default:
break;
}
} }
else else
{ {
PWM_Channel_Set_Duty(5, g_Light.Duty);//3.5 switch (g_Light.Duty)
{
case 150:
PWM_Channel_Set_Duty(5, 150);//3.5
break;
case 250:
PWM_Channel_Set_Duty(5, 280);//3.5
break;
case 350:
PWM_Channel_Set_Duty(5, 400);//3.5
break;
case 450:
PWM_Channel_Set_Duty(5, 550);//3.5
break;
case 550:
PWM_Channel_Set_Duty(5, 650);//3.5
break;
case 650:
PWM_Channel_Set_Duty(5, 780);//3.5
break;
case 750:
PWM_Channel_Set_Duty(5, 900);//3.5
break;
case 850:
PWM_Channel_Set_Duty(5, 1000);//3.5
break;
default:
break;
}
} }
} }
else else
{ {
...@@ -1413,13 +1484,68 @@ void Gui_LightProc(void) ...@@ -1413,13 +1484,68 @@ void Gui_LightProc(void)
{ {
if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_Enter_night_mode_sta() == 1)) if((Get_TelltalesLedSts(m_LED_Park_Lamp) == 1) || (Get_Enter_night_mode_sta() == 1))
{ {
PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5 switch (g_nightLight.Duty)
{
case 150:
PWM_Channel_Set_Duty(5, 150);//3.5
break;
case 250:
PWM_Channel_Set_Duty(5, 280);//3.5
break;
case 350:
PWM_Channel_Set_Duty(5, 400);//3.5
break;
case 450:
PWM_Channel_Set_Duty(5, 550);//3.5
break;
case 550:
PWM_Channel_Set_Duty(5, 650);//3.5
break;
case 650:
PWM_Channel_Set_Duty(5, 780);//3.5
break;
case 750:
PWM_Channel_Set_Duty(5, 900);//3.5
break;
case 850:
PWM_Channel_Set_Duty(5, 1000);//3.5
break;
default:
break;
}
} }
else else
{ {
PWM_Channel_Set_Duty(5, g_Light.Duty);//3.5 switch (g_Light.Duty)
{
case 150:
PWM_Channel_Set_Duty(5, 150);//3.5
break;
case 250:
PWM_Channel_Set_Duty(5, 280);//3.5
break;
case 350:
PWM_Channel_Set_Duty(5, 400);//3.5
break;
case 450:
PWM_Channel_Set_Duty(5, 550);//3.5
break;
case 550:
PWM_Channel_Set_Duty(5, 650);//3.5
break;
case 650:
PWM_Channel_Set_Duty(5, 780);//3.5
break;
case 750:
PWM_Channel_Set_Duty(5, 900);//3.5
break;
case 850:
PWM_Channel_Set_Duty(5, 1000);//3.5
break;
default:
break;
}
} }
} }
} }
PWM_Channel_Set_Duty(1, 0);//表盘 PWM_Channel_Set_Duty(1, 0);//表盘
......
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