Skip to content

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

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

背光亮度、开机动画变更

See merge request !37
parents 5d857d29 79948dfb
Show whitespace changes
Inline Side-by-side
Showing with 232 additions and 89 deletions
source/Appliciation/APP/InnerPicIndex.h
View file @ ecedbcc0
...@@ -15203,6 +15203,87 @@ const unsigned char __attribute__((aligned(8)))Set_CN_04_4_X112_Y190[152] = { ...@@ -15203,6 +15203,87 @@ const unsigned char __attribute__((aligned(8)))Set_CN_04_4_X112_Y190[152] = {
#endif #endif
const unsigned char __attribute__((aligned(8))) Kai_tu_03_X28_Y129[1264] = {
0xF0, 0x04, 0xB8, 0x80, 0x24, 0x80, 0x00, 0xFF, 0x00, 0x7F, 0x00, 0x1F, 0x88, 0x0F, 0x00, 0x1F,
0x00, 0x6F, 0x89, 0xFF, 0x00, 0x9F, 0x00, 0x1F, 0x89, 0x0F, 0x00, 0x1F, 0x00, 0x9F, 0x8B, 0xFF,
0x00, 0x8F, 0x00, 0x1F, 0x84, 0x0F, 0x00, 0x1F, 0x00, 0x7F, 0x8C, 0xFF, 0x00, 0x8F, 0x00, 0x3F,
0x00, 0x1F, 0x93, 0x0F, 0x00, 0x1F, 0x00, 0xAF, 0x90, 0xFF, 0x00, 0xBF, 0x00, 0x6F, 0x00, 0x2F,
0x00, 0x0E, 0x00, 0x0C, 0x00, 0x0B, 0x00, 0x09, 0x00, 0x08, 0x00, 0x07, 0x82, 0x06, 0x81, 0x05,
0x81, 0x06, 0x82, 0x07, 0x00, 0x0A, 0x00, 0xAF, 0x8F, 0xFF, 0x00, 0x9F, 0x00, 0x3F, 0x00, 0x0E,
0x00, 0x0A, 0x00, 0x08, 0x00, 0x07, 0x00, 0x05, 0x00, 0x04, 0x82, 0x03, 0x81, 0x02, 0x81, 0x03,
0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x09, 0x00, 0x0B, 0x00, 0x1E, 0x00, 0x4F,
0x00, 0x9F, 0x88, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x88, 0xFF, 0x00, 0x32, 0x8B, 0x00,
0x00, 0x01, 0x00, 0xCF, 0x89, 0xFF, 0x00, 0xCF, 0x00, 0x01, 0x86, 0x00, 0x00, 0x11, 0x89, 0xFF,
0x00, 0xDF, 0x00, 0x1C, 0x00, 0x02, 0x97, 0x00, 0x00, 0x23, 0x8D, 0xFF, 0x00, 0x6F, 0x00, 0x0A,
0x00, 0x03, 0x93, 0x00, 0x00, 0x88, 0x8C, 0xFF, 0x00, 0x7F, 0x00, 0x0B, 0x00, 0x03, 0x97, 0x00,
0x00, 0x02, 0x00, 0x0B, 0x00, 0x7F, 0x85, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x88, 0xFF,
0x00, 0xB7, 0x8C, 0x00, 0x00, 0x58, 0x89, 0xFF, 0x00, 0x58, 0x87, 0x00, 0x00, 0x84, 0x88, 0xFF,
0x00, 0xDF, 0x00, 0x05, 0x99, 0x00, 0x00, 0x22, 0x8B, 0xFF, 0x00, 0x3E, 0x00, 0x03, 0x96, 0x00,
0x00, 0x88, 0x8A, 0xFF, 0x00, 0x8F, 0x00, 0x06, 0x9D, 0x00, 0x00, 0x05, 0x00, 0x7F, 0x83, 0xFF,
0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x89, 0xFF, 0x00, 0x51, 0x8B, 0x00, 0x00, 0x01, 0x00, 0xCF,
0x87, 0xFF, 0x00, 0xDF, 0x00, 0x02, 0x86, 0x00, 0x00, 0x10, 0x00, 0xFC, 0x88, 0xFF, 0x00, 0x89,
0x9A, 0x00, 0x00, 0x22, 0x89, 0xFF, 0x00, 0xBF, 0x00, 0x17, 0x98, 0x00, 0x00, 0x98, 0x89, 0xFF,
0x00, 0x3C, 0x00, 0x01, 0xA0, 0x00, 0x00, 0x2B, 0x82, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD,
0x89, 0xFF, 0x00, 0xD9, 0x8C, 0x00, 0x00, 0x59, 0x87, 0xFF, 0x00, 0x6A, 0x87, 0x00, 0x00, 0x85,
0x89, 0xFF, 0x00, 0x77, 0x8C, 0x00, 0x00, 0x80, 0x89, 0xC0, 0x81, 0xD0, 0x00, 0xE1, 0x00, 0xF8,
0x88, 0xFF, 0x00, 0xCF, 0x00, 0x03, 0x8C, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0xC0, 0x00, 0xD0,
0x85, 0xE0, 0x81, 0xD0, 0x00, 0xF2, 0x00, 0xFD, 0x88, 0xFF, 0x00, 0x4A, 0x8C, 0x00, 0x00, 0x50,
0x00, 0xE1, 0x00, 0xF4, 0x83, 0xF5, 0x00, 0xF4, 0x00, 0xF1, 0x00, 0x70, 0x00, 0x10, 0x8B, 0x00,
0x00, 0x4A, 0x81, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x8A, 0xFF, 0x00, 0x62, 0x8B, 0x00,
0x00, 0x01, 0x00, 0xDF, 0x85, 0xFF, 0x00, 0xEF, 0x00, 0x03, 0x86, 0x00, 0x00, 0x10, 0x00, 0xFC,
0x89, 0xFF, 0x00, 0x77, 0x8B, 0x00, 0x00, 0x43, 0x97, 0xFF, 0x00, 0x37, 0x8B, 0x00, 0x00, 0x10,
0x00, 0xD3, 0x00, 0xFE, 0x94, 0xFF, 0x00, 0xBE, 0x00, 0x01, 0x8A, 0x00, 0x00, 0x10, 0x00, 0xE5,
0x89, 0xFF, 0x00, 0xF8, 0x00, 0x20, 0x8A, 0x00, 0x00, 0x01, 0x00, 0xAE, 0x00, 0xFF, 0x00, 0xEE,
0x8C, 0x00, 0x00, 0xDD, 0x8A, 0xFF, 0x00, 0xEA, 0x8C, 0x00, 0x00, 0x59, 0x85, 0xFF, 0x00, 0x7B,
0x87, 0x00, 0x00, 0x85, 0x8A, 0xFF, 0x00, 0x77, 0x8B, 0x00, 0x00, 0x34, 0x89, 0xCF, 0x00, 0xEF,
0x8B, 0xFF, 0x00, 0xEF, 0x00, 0x01, 0x8B, 0x00, 0x00, 0x85, 0x96, 0xFF, 0x00, 0x58, 0x8B, 0x00,
0x00, 0x64, 0x8B, 0xFF, 0x00, 0x97, 0x8B, 0x00, 0x00, 0x57, 0x00, 0xFF, 0x00, 0xEE, 0x8C, 0x00,
0x00, 0xDD, 0x8B, 0xFF, 0x00, 0x73, 0x8B, 0x00, 0x00, 0x02, 0x00, 0xDF, 0x84, 0xFF, 0x00, 0x14,
0x86, 0x00, 0x00, 0x10, 0x00, 0xFC, 0x8A, 0xFF, 0x00, 0x77, 0x96, 0x00, 0x00, 0x01, 0x00, 0x49,
0x8A, 0xFF, 0x00, 0xBC, 0x8C, 0x00, 0x00, 0x98, 0x96, 0xFF, 0x00, 0x23, 0x8B, 0x00, 0x00, 0x87,
0x8B, 0xFF, 0x00, 0xCA, 0x8B, 0x00, 0x00, 0x13, 0x00, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD,
0x8B, 0xFF, 0x00, 0xFB, 0x00, 0x10, 0x8B, 0x00, 0x00, 0x69, 0x83, 0xFF, 0x00, 0x9C, 0x87, 0x00,
0x00, 0x85, 0x8B, 0xFF, 0x00, 0x77, 0x97, 0x00, 0x00, 0x33, 0x8A, 0xFF, 0x00, 0xAA, 0x8C, 0x00,
0x00, 0x99, 0x96, 0xFF, 0x00, 0x01, 0x8B, 0x00, 0x00, 0x98, 0x8B, 0xFF, 0x00, 0xDC, 0x8C, 0x00,
0x00, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x8C, 0xFF, 0x00, 0x84, 0x8B, 0x00, 0x00, 0x02,
0x00, 0xDF, 0x82, 0xFF, 0x00, 0x25, 0x86, 0x00, 0x00, 0x10, 0x00, 0xFC, 0x8B, 0xFF, 0x00, 0x77,
0x97, 0x00, 0x00, 0x33, 0x8A, 0xFF, 0x00, 0xBA, 0x8C, 0x00, 0x00, 0x89, 0x96, 0xFF, 0x00, 0x21,
0x8B, 0x00, 0x00, 0x88, 0x8B, 0xFF, 0x00, 0xCC, 0x8B, 0x00, 0x00, 0x10, 0x00, 0xFF, 0x00, 0xEE,
0x8C, 0x00, 0x00, 0xDD, 0x8C, 0xFF, 0x00, 0xFC, 0x00, 0x10, 0x8B, 0x00, 0x00, 0x6A, 0x81, 0xFF,
0x00, 0xAD, 0x87, 0x00, 0x00, 0x85, 0x8C, 0xFF, 0x00, 0x77, 0x8B, 0x00, 0x00, 0x20, 0x89, 0x80,
0x00, 0xA0, 0x00, 0xF7, 0x8A, 0xFF, 0x00, 0xDC, 0x8C, 0x00, 0x00, 0x67, 0x96, 0xFF, 0x00, 0x53,
0x8B, 0x00, 0x00, 0x56, 0x8B, 0xFF, 0x00, 0xAB, 0x8B, 0x00, 0x00, 0x42, 0x00, 0xFF, 0x00, 0xEE,
0x8C, 0x00, 0x00, 0xDD, 0x8D, 0xFF, 0x00, 0x95, 0x8B, 0x00, 0x00, 0x02, 0x00, 0xEF, 0x00, 0xFF,
0x00, 0x37, 0x86, 0x00, 0x00, 0x10, 0x00, 0xFC, 0x8C, 0xFF, 0x00, 0x77, 0x8B, 0x00, 0x00, 0x44,
0x97, 0xFF, 0x00, 0x31, 0x8B, 0x00, 0x00, 0x03, 0x00, 0xCF, 0x95, 0xFF, 0x00, 0xB8, 0x8B, 0x00,
0x00, 0x03, 0x00, 0xDF, 0x8A, 0xFF, 0x00, 0x38, 0x8B, 0x00, 0x00, 0x96, 0x00, 0xFF, 0x00, 0xEE,
0x8C, 0x00, 0x00, 0xDD, 0x8D, 0xFF, 0x00, 0xFD, 0x00, 0x20, 0x8B, 0x00, 0x00, 0x08, 0x00, 0x0D,
0x00, 0x01, 0x86, 0x00, 0x00, 0x85, 0x8D, 0xFF, 0x00, 0x77, 0x8B, 0x00, 0x00, 0x13, 0x00, 0x9F,
0x8B, 0xEF, 0x8A, 0xFF, 0x00, 0xB7, 0x8C, 0x00, 0x00, 0x02, 0x00, 0x1E, 0x00, 0x8F, 0x00, 0xDF,
0x81, 0xEF, 0x91, 0xFF, 0x00, 0x41, 0x8B, 0x00, 0x00, 0x04, 0x00, 0x4F, 0x00, 0xCF, 0x85, 0xFF,
0x00, 0xEF, 0x00, 0x6F, 0x00, 0x08, 0x8B, 0x00, 0x00, 0x20, 0x00, 0xFC, 0x00, 0xFF, 0x00, 0xEE,
0x8C, 0x00, 0x00, 0xDD, 0x8E, 0xFF, 0x00, 0xB7, 0x94, 0x00, 0x00, 0x10, 0x00, 0xFC, 0x8D, 0xFF,
0x00, 0x77, 0x9A, 0x00, 0x00, 0x06, 0x00, 0xEF, 0x88, 0xFF, 0x00, 0xA3, 0x93, 0x00, 0x82, 0x01,
0x81, 0x00, 0x00, 0x02, 0x00, 0x5C, 0x88, 0xFF, 0x00, 0xFA, 0x00, 0x30, 0x8D, 0x00, 0x00, 0x02,
0x00, 0x03, 0x00, 0x04, 0x81, 0x03, 0x00, 0x02, 0x00, 0x01, 0x8C, 0x00, 0x00, 0x10, 0x00, 0xE8,
0x81, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x8E, 0xFF, 0x00, 0xFE, 0x00, 0x41, 0x93, 0x00,
0x00, 0x95, 0x8E, 0xFF, 0x00, 0xB8, 0x9B, 0x00, 0x00, 0xEE, 0x89, 0xFF, 0x00, 0xE5, 0x00, 0x30,
0x97, 0x00, 0x00, 0x55, 0x89, 0xFF, 0x00, 0xFB, 0x00, 0x70, 0x9F, 0x00, 0x00, 0x50, 0x00, 0xFA,
0x82, 0xFF, 0x00, 0xEE, 0x8C, 0x00, 0x00, 0xDD, 0x8F, 0xFF, 0x00, 0xFA, 0x00, 0x40, 0x91, 0x00,
0x00, 0xA2, 0x90, 0xFF, 0x00, 0xB2, 0x00, 0x10, 0x99, 0x00, 0x00, 0xEE, 0x8A, 0xFF, 0x00, 0xFD,
0x00, 0xE2, 0x00, 0x40, 0x95, 0x00, 0x00, 0x55, 0x8B, 0xFF, 0x00, 0xF5, 0x00, 0x60, 0x9B, 0x00,
0x00, 0x60, 0x00, 0xF4, 0x84, 0xFF, 0x00, 0xFE, 0x00, 0x40, 0x8A, 0x00, 0x00, 0x40, 0x00, 0xFD,
0x90, 0xFF, 0x00, 0xFE, 0x00, 0xF4, 0x00, 0x90, 0x00, 0x20, 0x8A, 0x00, 0x00, 0x10, 0x00, 0x40,
0x00, 0xC1, 0x00, 0xF8, 0x92, 0xFF, 0x00, 0xFA, 0x00, 0xD1, 0x00, 0x50, 0x00, 0x10, 0x95, 0x00,
0x00, 0x40, 0x00, 0xFE, 0x8D, 0xFF, 0x00, 0xF9, 0x00, 0xF2, 0x00, 0xA0, 0x00, 0x50, 0x00, 0x10,
0x90, 0x00, 0x00, 0x75, 0x8D, 0xFF, 0x00, 0xFA, 0x00, 0xF2, 0x00, 0x90, 0x00, 0x30, 0x93, 0x00,
0x00, 0x30, 0x00, 0x90, 0x00, 0xF2, 0x00, 0xFA, 0x88, 0xFF, 0x00, 0xFC, 0x88, 0xFB, 0x00, 0xFC,
0x96, 0xFF, 0x00, 0xFE, 0x81, 0xFC, 0x86, 0xFB, 0x00, 0xFD, 0x9A, 0xFF, 0x00, 0xFD, 0x93, 0xFB,
0x00, 0xFC, 0x94, 0xFF, 0x00, 0xFD, 0x00, 0xFB, 0x00, 0xF9, 0x00, 0xF8, 0x81, 0xF6, 0x00, 0xF5,
0x00, 0xF4, 0x82, 0xF3, 0x81, 0xF4, 0x00, 0xF5, 0x00, 0xF6, 0x00, 0xF7, 0x00, 0xF9, 0x92, 0xFF,
0x00, 0xFD, 0x00, 0xFA, 0x00, 0xF8, 0x00, 0xF7, 0x00, 0xF5, 0x00, 0xF4, 0x82, 0xF3, 0x82, 0xF2,
0x81, 0xF3, 0x00, 0xF4, 0x00, 0xF5, 0x00, 0xF7, 0x00, 0xF8, 0x00, 0xFA, 0x00, 0xFD, 0x8A, 0xFF,
};
source/Appliciation/CAN_App/CAN_APP.c
View file @ ecedbcc0
...@@ -537,77 +537,76 @@ void Can_Set_Buff_18D00017(canlib_uint8_t CopyData []) ...@@ -537,77 +537,76 @@ void Can_Set_Buff_18D00017(canlib_uint8_t CopyData [])
{ {
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))
{ {
if(g_nightLight.Duty == 100) if(g_nightLight.Duty == 150)
{ {
IC_ILLUMINATION = 10; IC_ILLUMINATION = 15;
}
else if(g_nightLight.Duty == 200)
{
IC_ILLUMINATION = 20;
} }
else if(g_nightLight.Duty == 250) else if(g_nightLight.Duty == 250)
{ {
IC_ILLUMINATION = 27; IC_ILLUMINATION = 25;
} }
else if(g_nightLight.Duty == 300) else if(g_nightLight.Duty == 350)
{ {
IC_ILLUMINATION = 35; IC_ILLUMINATION = 35;
} }
else if(g_nightLight.Duty == 350) else if(g_nightLight.Duty == 450)
{ {
IC_ILLUMINATION = 45; IC_ILLUMINATION = 45;
} }
else if(g_nightLight.Duty == 400) else if(g_nightLight.Duty == 550)
{ {
IC_ILLUMINATION = 58; IC_ILLUMINATION = 55;
} }
else if(g_nightLight.Duty == 450) else if(g_nightLight.Duty == 650)
{
IC_ILLUMINATION = 65;
}
else if(g_nightLight.Duty == 750)
{ {
IC_ILLUMINATION = 73; IC_ILLUMINATION = 75;
} }
else if(g_nightLight.Duty == 500) else if(g_nightLight.Duty == 850)
{ {
IC_ILLUMINATION = 100; IC_ILLUMINATION = 85;
} }
else else
{ {
IC_ILLUMINATION = 0; IC_ILLUMINATION = 0;
} }
} }
else else
{ {
if(g_Light.Duty == 100) if(g_Light.Duty == 150)
{ {
IC_ILLUMINATION = 10; IC_ILLUMINATION = 15;
}
else if(g_Light.Duty == 200)
{
IC_ILLUMINATION = 20;
} }
else if(g_Light.Duty == 250) else if(g_Light.Duty == 250)
{ {
IC_ILLUMINATION = 27; IC_ILLUMINATION = 25;
} }
else if(g_Light.Duty == 300) else if(g_Light.Duty == 350)
{ {
IC_ILLUMINATION = 35; IC_ILLUMINATION = 35;
} }
else if(g_Light.Duty == 350) else if(g_Light.Duty == 450)
{ {
IC_ILLUMINATION = 45; IC_ILLUMINATION = 45;
} }
else if(g_Light.Duty == 400) else if(g_Light.Duty == 550)
{ {
IC_ILLUMINATION = 58; IC_ILLUMINATION = 55;
} }
else if(g_Light.Duty == 450) else if(g_Light.Duty == 650)
{
IC_ILLUMINATION = 65;
}
else if(g_Light.Duty == 750)
{ {
IC_ILLUMINATION = 73; IC_ILLUMINATION = 75;
} }
else if(g_Light.Duty == 500) else if(g_Light.Duty == 850)
{ {
IC_ILLUMINATION = 100; IC_ILLUMINATION = 85;
} }
else else
{ {
......
source/Appliciation/DataProcess.c
View file @ ecedbcc0
...@@ -1192,8 +1192,8 @@ void GUI_Sound_Init(void) ...@@ -1192,8 +1192,8 @@ void GUI_Sound_Init(void)
void GUI_Light_Init(void) void GUI_Light_Init(void)
{ {
g_Light.Duty = 450; g_Light.Duty = 750;
g_nightLight.Duty = 100; g_nightLight.Duty = 150;
} }
DataEnternightmode nightmode; DataEnternightmode nightmode;
...@@ -1227,7 +1227,7 @@ uint32_t Get_Enter_night_mode_sta(void) ...@@ -1227,7 +1227,7 @@ uint32_t Get_Enter_night_mode_sta(void)
void GUI_nightLightWeakup_Init(void) void GUI_nightLightWeakup_Init(void)
{ {
g_nightLight.Duty = 100; g_nightLight.Duty = 150;
} }
void Gui_LightProc(void) void Gui_LightProc(void)
{ {
...@@ -1242,49 +1242,66 @@ void Gui_LightProc(void) ...@@ -1242,49 +1242,66 @@ void Gui_LightProc(void)
if(DiagBackLight == 0) if(DiagBackLight == 0)
{ {
PWM_Channel_Set_Duty(1, 0);//表盘 PWM_Channel_Set_Duty(1, 0);//表盘
PWM_Channel_Set_Duty(5, 0);//3.5
PWM_Channel_Set_Duty(3, 0);//指针 PWM_Channel_Set_Duty(3, 0);//指针
} }
else if(DiagBackLight == 1) else if(DiagBackLight == 1)
{ {
PWM_Channel_Set_Duty(1, 150);//表盘 PWM_Channel_Set_Duty(1, 150);//表盘
PWM_Channel_Set_Duty(3, 150);//指针 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, 200);//表盘 PWM_Channel_Set_Duty(1, 250);//表盘
PWM_Channel_Set_Duty(3, 200);//指针 PWM_Channel_Set_Duty(5, 250);//3.5
PWM_Channel_Set_Duty(3, 175);//指针
} }
else if(DiagBackLight == 3) else if(DiagBackLight == 3)
{ {
PWM_Channel_Set_Duty(1, 250);//表盘 PWM_Channel_Set_Duty(1, 350);//表盘
PWM_Channel_Set_Duty(3, 250);//指针 PWM_Channel_Set_Duty(5, 350);//3.5
PWM_Channel_Set_Duty(3, 200);//指针
} }
else if(DiagBackLight == 4) else if(DiagBackLight == 4)
{ {
PWM_Channel_Set_Duty(1, 300);//表盘 PWM_Channel_Set_Duty(1, 450);//表盘
PWM_Channel_Set_Duty(3, 300);//指针 PWM_Channel_Set_Duty(5, 450);//3.5
PWM_Channel_Set_Duty(3, 275);//指针
} }
else if(DiagBackLight == 5) else if(DiagBackLight == 5)
{ {
PWM_Channel_Set_Duty(1, 350);//表盘 PWM_Channel_Set_Duty(1, 550);//表盘
PWM_Channel_Set_Duty(5, 550);//3.5
PWM_Channel_Set_Duty(3, 350);//指针 PWM_Channel_Set_Duty(3, 350);//指针
} }
else if(DiagBackLight == 6) else if(DiagBackLight == 6)
{ {
PWM_Channel_Set_Duty(1, 400);//表盘 PWM_Channel_Set_Duty(1, 650);//表盘
PWM_Channel_Set_Duty(5, 650);//3.5
PWM_Channel_Set_Duty(3, 400);//指针 PWM_Channel_Set_Duty(3, 400);//指针
} }
else if(DiagBackLight == 7) else if(DiagBackLight == 7)
{ {
PWM_Channel_Set_Duty(1, 450);//表盘 PWM_Channel_Set_Duty(1, 750);//表盘
PWM_Channel_Set_Duty(5, 750);//3.5
PWM_Channel_Set_Duty(3, 450);//指针 PWM_Channel_Set_Duty(3, 450);//指针
} }
else else
{ {
if(DiagBackLight == 8) if(DiagBackLight == 8)
{ {
PWM_Channel_Set_Duty(1, 500);//表盘 PWM_Channel_Set_Duty(1, 850);//表盘
PWM_Channel_Set_Duty(5, 850);//3.5
PWM_Channel_Set_Duty(3, 500);//指针 PWM_Channel_Set_Duty(3, 500);//指针
} }
} }
} }
...@@ -1293,8 +1310,38 @@ void Gui_LightProc(void) ...@@ -1293,8 +1310,38 @@ 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(1, g_nightLight.Duty);//表盘
PWM_Channel_Set_Duty(3, g_nightLight.Duty);//指针
PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5 PWM_Channel_Set_Duty(5, g_nightLight.Duty);//3.5
switch (g_nightLight.Duty)
{
case 150:
PWM_Channel_Set_Duty(3, 50);//指针
break;
case 250:
PWM_Channel_Set_Duty(3, 175);//指针
break;
case 350:
PWM_Channel_Set_Duty(3, 200);//指针
break;
case 450:
PWM_Channel_Set_Duty(3, 275);//指针
break;
case 550:
PWM_Channel_Set_Duty(3, 350);//指针
break;
case 650:
PWM_Channel_Set_Duty(3, 400);//指针
break;
case 750:
PWM_Channel_Set_Duty(3, 450);//指针
break;
case 850:
PWM_Channel_Set_Duty(3, 500);//指针
break;
default:
break;
}
} }
else//close lamp else//close lamp
...@@ -1303,7 +1350,36 @@ void Gui_LightProc(void) ...@@ -1303,7 +1350,36 @@ void Gui_LightProc(void)
// 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);//指针 switch (g_Light.Duty)
{
case 150:
PWM_Channel_Set_Duty(3, 50);//指针
break;
case 250:
PWM_Channel_Set_Duty(3, 175);//指针
break;
case 350:
PWM_Channel_Set_Duty(3, 200);//指针
break;
case 450:
PWM_Channel_Set_Duty(3, 275);//指针
break;
case 550:
PWM_Channel_Set_Duty(3, 350);//指针
break;
case 650:
PWM_Channel_Set_Duty(3, 400);//指针
break;
case 750:
PWM_Channel_Set_Duty(3, 450);//指针
break;
case 850:
PWM_Channel_Set_Duty(3, 500);//指针
break;
default:
break;
}
// } // }
// else // else
// { // {
......
source/Appliciation/Display/GUI.c
View file @ ecedbcc0
...@@ -294,11 +294,12 @@ void GUI_Service(void) ...@@ -294,11 +294,12 @@ void GUI_Service(void)
/************************************************************************************************/ /************************************************************************************************/
void GUI_Display_PowerOn(void) void GUI_Display_PowerOn(void)
{ {
Draw_Image_Local(( uint8_t * )Kai_tu_01_X38_Y122, 39, 122); Draw_Image_Local(( uint8_t * )Kai_tu_03_X28_Y129, 28, 129);
Draw_Image_Local(( uint8_t * )Kai_V_X175_Y287, 175, 287); // Draw_Image_Local(( uint8_t * )Kai_V_X175_Y287, 175, 287);
Draw_Image_Local(( uint8_t * )Number_17_White_1_X0_Y0, 189, 287); // Draw_Image_Local(( uint8_t * )Number_17_White_0_X0_Y0, 189, 287);
Draw_Image_Local(( uint8_t * )Number_17_White_point3_X0_Y0, 200, 287); // Draw_Image_Local(( uint8_t * )Number_17_White_point3_X0_Y0, 200, 287);
Draw_Image_Local(( uint8_t * )Number_17_White_0_X0_Y0, 206, 287); // Draw_Image_Local(( uint8_t * )Number_17_White_5_X0_Y0, 206, 287);
} }
/***********************************************************************************************************************/ /***********************************************************************************************************************/
uint16 u16LJSfueltesk[10]; uint16 u16LJSfueltesk[10];
...@@ -4074,42 +4075,42 @@ void Gui_Backlight(INT8U Backlight) ...@@ -4074,42 +4075,42 @@ void Gui_Backlight(INT8U Backlight)
Draw_Image_Local(( uint8_t * )Set_CN_01_1_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_1_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_0_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_0_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 100) ) else if ((g_nightLight.Duty == 150) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_2_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_2_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_1_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_1_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 200) ) else if ((g_nightLight.Duty == 250) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_3_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_3_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_2_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_2_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 250) ) else if ((g_nightLight.Duty == 350) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_4_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_4_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_3_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_3_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 300) ) else if ((g_nightLight.Duty == 450) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_5_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_5_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_4_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_4_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 350) ) else if ((g_nightLight.Duty == 550) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_6_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_6_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_5_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_5_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 400) ) else if ((g_nightLight.Duty == 650) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_7_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_7_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_6_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_6_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 450) ) else if ((g_nightLight.Duty == 750) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_8_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_8_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_7_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_7_X0_Y0, 114, 191);
} }
else if ((g_nightLight.Duty == 500) ) else if ((g_nightLight.Duty == 850) )
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_9_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_9_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_8_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_8_X0_Y0, 114, 191);
...@@ -4122,42 +4123,42 @@ void Gui_Backlight(INT8U Backlight) ...@@ -4122,42 +4123,42 @@ void Gui_Backlight(INT8U Backlight)
Draw_Image_Local(( uint8_t * )Set_CN_01_1_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_1_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_0_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_0_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 100)) else if ( (g_Light.Duty == 150))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_2_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_2_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_1_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_1_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 200)) else if ( (g_Light.Duty == 250))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_3_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_3_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_2_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_2_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 250)) else if ( (g_Light.Duty == 350))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_4_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_4_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_3_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_3_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 300)) else if ( (g_Light.Duty == 450))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_5_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_5_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_4_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_4_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 350)) else if ( (g_Light.Duty == 550))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_6_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_6_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_5_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_5_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 400)) else if ( (g_Light.Duty == 650))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_7_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_7_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_6_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_6_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 450)) else if ( (g_Light.Duty == 750))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_8_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_8_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_7_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_7_X0_Y0, 114, 191);
} }
else if ( (g_Light.Duty == 500)) else if ( (g_Light.Duty == 850))
{ {
Draw_Image_Local(( uint8_t * )Set_CN_01_9_X35_Y169, 35, 169); Draw_Image_Local(( uint8_t * )Set_CN_01_9_X35_Y169, 35, 169);
Draw_Image_Local(( uint8_t * )Number_18_White_8_X0_Y0, 114, 191); Draw_Image_Local(( uint8_t * )Number_18_White_8_X0_Y0, 114, 191);
......
source/Appliciation/Menu_Interface.c
View file @ ecedbcc0
...@@ -303,30 +303,16 @@ void Menu_Logic_Operation_SET_Backlight(Menu_Key_en_t enKeyType) ...@@ -303,30 +303,16 @@ void Menu_Logic_Operation_SET_Backlight(Menu_Key_en_t enKeyType)
else if (enKeyType == MENU_KEY_RIGHT_SHORT) else if (enKeyType == MENU_KEY_RIGHT_SHORT)
{ {
updataDir = 1; updataDir = 1;
datmax = 500u; datmax = 850u;
datmin = 100u; datmin = 150u;
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))
{
if(g_nightLight.Duty == 100u)
{ {
Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 100u, (uint16_t*)&(g_nightLight.Duty)); Menu_u16Data_Updata_Process(updataDir, datmax, datmin, 100u, (uint16_t*)&(g_nightLight.Duty));
} }
else 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)); 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)
......
source/UDS/UDS_22Service_Main.c
View file @ ecedbcc0
...@@ -9,11 +9,11 @@ const uint8_t DID_22_F190[17] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, ...@@ -9,11 +9,11 @@ const uint8_t DID_22_F190[17] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
/*ECUHardwareNumberDataIdentifier(硬件号)*/ /*ECUHardwareNumberDataIdentifier(硬件号)*/
const uint8_t DID_22_F192[16] = {'5','8','0','3','3','1','0','8','1','8',0x20,0x20,0x20,0x20,0x20,0x20}; const uint8_t DID_22_F192[16] = {'5','8','0','3','3','1','0','8','1','8',0x20,0x20,0x20,0x20,0x20,0x20};
/*ECUHardwareVersionNumberDataIdentifier（硬件版本号）*/ /*ECUHardwareVersionNumberDataIdentifier（硬件版本号）*/
const uint8_t DID_22_F193[8] = {'V','1','.','0',0x20,0x20,0x20,0x20}; const uint8_t DID_22_F193[8] = {'V','1','.','1',0x20,0x20,0x20,0x20};
/*ECUHardwareVersionNumberDataIdentifier（软件号）*/ /*ECUHardwareVersionNumberDataIdentifier（软件号）*/
const uint8_t DID_22_F194[16] = {'5','8','0','3','3','1','0','8','1','7',0x20,0x20,0x20,0x20,0x20,0x20}; const uint8_t DID_22_F194[16] = {'5','8','0','3','3','1','0','8','1','7',0x20,0x20,0x20,0x20,0x20,0x20};
/*ECUSoftwareVersionNumberDataIdentifier（软件版本号）*/ /*ECUSoftwareVersionNumberDataIdentifier（软件版本号）*/
const uint8_t DID_22_F195[8] = {'V','1','.','4',0x20,0x20,0x20,0x20}; const uint8_t DID_22_F195[8] = {'V','1','.','5',0x20,0x20,0x20,0x20};
/*SystemNameDataIdentifier（ECU名称）*/ /*SystemNameDataIdentifier（ECU名称）*/
const uint8_t DID_22_F197[10] = {'I','C','-','N','S','2','0','8','-','2'}; const uint8_t DID_22_F197[10] = {'I','C','-','N','S','2','0','8','-','2'};
/*EOLProgrammingDate*/ /*EOLProgrammingDate*/
......
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