Skip to content

V
VC66_7C
Commit 87249c1a authored by hu's avatar hu
Browse files
Options

增加报警1分钟不显示，调整按键初始化相应时间，调整图片，FV00.07

parent 5e1d7cd9
Show whitespace changes
Inline Side-by-side
Showing with 968 additions and 754 deletions
source/Application/APP/Key/Key.c
View file @ 87249c1a
...@@ -303,10 +303,11 @@ void Key_Init(void) ...@@ -303,10 +303,11 @@ void Key_Init(void)
stKeyCtrVariate[i].u8KeyIGNChangeFlag = 0U; stKeyCtrVariate[i].u8KeyIGNChangeFlag = 0U;
stKeyCtrVariate[i].u16KeyIGNTimeCount = 0U; stKeyCtrVariate[i].u16KeyIGNTimeCount = 0U;
} }
stKeyParameter.u16KeyLoosenTime = 50U; /*按键动作时间*/
stKeyParameter.u16KeyLoosenTime = 200U;
stKeyParameter.u16KeyShortPressTime = 40U; stKeyParameter.u16KeyShortPressTime = 40U;
stKeyParameter.u16KeyLongPressTime = 2000U; stKeyParameter.u16KeyLongPressTime = 2000U;
stKeyParameter.u16KeySuperLongPressTime = 30000U; stKeyParameter.u16KeySuperLongPressTime = 10000U;
stKeyParameter.u16KeyValidOFFTime = 200U;/*按键动作时间*/ stKeyParameter.u16KeyValidOFFTime = 200U;/*按键动作时间*/
stKeyParameter.u16KeyValidONTime = 1000U; stKeyParameter.u16KeyValidONTime = 1000U;
} }
......
source/Application/APP/Key/Key_user.c
View file @ 87249c1a
...@@ -58,7 +58,10 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -58,7 +58,10 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
if (DispVSpeed <= DISPSPEEDNULLMAX) if (DispVSpeed <= DISPSPEEDNULLMAX)
{ {
if ((enKeyEvent == KEY_EVENT_SHORT_PRESS) && (popupID == 0xffffu )) /*----无车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
/*主界面 一级菜单 二级菜单那*/ /*主界面 一级菜单 二级菜单那*/
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) || if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
...@@ -291,13 +294,50 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -291,13 +294,50 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
User_set_Num.User_Parking = 0u; User_set_Num.User_Parking = 0u;
} }
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
/*----无车速，有报警----*/
else
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
}
else
{
/*----有车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
} }
}
/*----有车速，有报警----*/
else else
{ {
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
} }
} }
} }
...@@ -319,7 +359,10 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -319,7 +359,10 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
if (DispVSpeed <= DISPSPEEDNULLMAX) if (DispVSpeed <= DISPSPEEDNULLMAX)
{ {
if ((enKeyEvent == KEY_EVENT_SHORT_PRESS) && (popupID == 0xffffu )) /*----无车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
/*主界面 一级菜单 二级菜单*/ /*主界面 一级菜单 二级菜单*/
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) || if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
...@@ -546,11 +589,50 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -546,11 +589,50 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
} }
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
} }
else else
{ {
/*----无车速，有报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
}
else
{
/*----有车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
/*----有车速，有报警----*/
else
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
} }
} }
} }
...@@ -572,7 +654,10 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -572,7 +654,10 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (DispVSpeed <= DISPSPEEDNULLMAX) if (DispVSpeed <= DISPSPEEDNULLMAX)
{ {
if ((enKeyEvent == KEY_EVENT_SHORT_PRESS) && (popupID == 0xffffu )) /*----无车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) || if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47))) ((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
...@@ -608,12 +693,44 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -608,12 +693,44 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
} }
} }
else else
{
/*----无车速，有报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
}
else
{
/*----有车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*D0 Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
/*----有车速，有报警----*/
else
{ {
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
;/*D0 Nothing!*/
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
;/*D0 Nothing!*/
}
} }
} }
} }
...@@ -635,7 +752,10 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -635,7 +752,10 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
if (DispVSpeed <= DISPSPEEDNULLMAX) if (DispVSpeed <= DISPSPEEDNULLMAX)
{ {
if ((enKeyEvent == KEY_EVENT_SHORT_PRESS) && (popupID == 0xffffu )) /*----无车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU)) if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU))
{ {
...@@ -689,11 +809,49 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -689,11 +809,49 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
;/*do nothing*/ ;/*do nothing*/
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*D0 Nothing!*/
}
}
else
{
/*----无车速，有报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*Do Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
MenuFlag.Key_Menu_Popup_time = 6000u;
}
}
} }
else else
{ {
if (popupID == 0xffffu )
{
/*----有车速，无报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
;/*Do Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*Do Nothing!*/
}
}
else
{
/*----有车速，无报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*Do Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
MenuFlag.Key_Menu_Popup_time = 6000u;
}
} }
} }
} }
...@@ -718,7 +876,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -718,7 +876,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
if (DispVSpeed <= DISPSPEEDNULLMAX) if (DispVSpeed <= DISPSPEEDNULLMAX)
{ {
if ((enKeyEvent == KEY_EVENT_SHORT_PRESS) && (popupID == 0xffffu )) /*----无车速，无报警----*/
if (popupID == 0xffffu )
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
/*记录进入menu菜单的位置*/ /*记录进入menu菜单的位置*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6)) if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
...@@ -753,11 +914,49 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -753,11 +914,49 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
NextMenu(MenuFlag.Menu_Flag); NextMenu(MenuFlag.Menu_Flag);
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*Do Nothing!*/
}
} }
else else
{ {
/*----无车速，有报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
;/*Do Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*Do Nothing!*/
}
}
}
else
{
if (popupID == 0xffffu )
{
/*----有车速，无报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*Do Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*Do Nothing!*/
}
}
else
{
/*----有车速，无报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;/*Do Nothing!*/
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
;/*Do Nothing!*/
}
} }
} }
} }
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 87249c1a
...@@ -144,6 +144,9 @@ void MenuInit(void) ...@@ -144,6 +144,9 @@ void MenuInit(void)
{ {
;/*do nothing*/ ;/*do nothing*/
} }
/*数据初始化*/
MenuFlag.Key_Menu_Popup_time = 0u;
} }
void MenuManage(void) void MenuManage(void)
{ {
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 87249c1a
...@@ -83,12 +83,21 @@ void DisplayServices(void) ...@@ -83,12 +83,21 @@ void DisplayServices(void)
{ {
popupID = Popup_Get_Current_Message( ); popupID = Popup_Get_Current_Message( );
if ( popupID != 0xffffu ) if ((popupID != 0xffffu ) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
{ {
UE_EN [ Display_Alarm ] = UE_Enable; UE_EN [ Display_Alarm ] = UE_Enable;
} }
else else
{ {
if (MenuFlag.Key_Menu_Popup_time != 0x00u)
{
MenuFlag.Key_Menu_Popup_time --;
}
else
{
;/*Do Nothing!*/
}
UE_EN [ Display_Alarm ] = UE_Disable; UE_EN [ Display_Alarm ] = UE_Disable;
if ( PowerStatus == COMMON_POWER_ON ) if ( PowerStatus == COMMON_POWER_ON )
...@@ -101,35 +110,9 @@ void DisplayServices(void) ...@@ -101,35 +110,9 @@ void DisplayServices(void)
} }
} }
} }
DispSch_xxxMs_Logic(10u);
}
void Display_StartAnimationEnter(void)
{
GUI_Display_background();
}
void Display_StartAnimationService(void)
{
uint16_t m16_FrameCnt;
HMI_StartAnimationFrameCnt++;
m16_FrameCnt = HMI_StartAnimationFrameCnt;
if ( (m16_FrameCnt % 3) == 0 )
{
loc_Disable_Window_App( );
//GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
GUI_Display_background();
}
}
void Display_StartAnimationExit(void) DispSch_xxxMs_Logic(10u);
{
loc_Enable_Window_App( );
}
void Display_MenuService(void)
{
/*上短*/ /*上短*/
if ( UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP == KEY_EVENT_SHORT_PRESS ) if ( UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP == KEY_EVENT_SHORT_PRESS )
{ {
...@@ -193,6 +176,35 @@ void Display_MenuService(void) ...@@ -193,6 +176,35 @@ void Display_MenuService(void)
;/*do nothing*/ ;/*do nothing*/
} }
} }
void Display_StartAnimationEnter(void)
{
GUI_Display_background();
}
void Display_StartAnimationService(void)
{
uint16_t m16_FrameCnt;
HMI_StartAnimationFrameCnt++;
m16_FrameCnt = HMI_StartAnimationFrameCnt;
if ( (m16_FrameCnt % 3) == 0 )
{
loc_Disable_Window_App( );
//GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
GUI_Display_background();
}
}
void Display_StartAnimationExit(void)
{
loc_Enable_Window_App( );
}
void Display_MenuService(void)
{
}
void Display_AlarmService(void) void Display_AlarmService(void)
{ {
......
source/Application/RTE/Common_Interface.c
View file @ 87249c1a
...@@ -320,7 +320,7 @@ void Common_Input_Para(void) ...@@ -320,7 +320,7 @@ void Common_Input_Para(void)
} }
/**/ /**/
if (RTE_Read_KL15_Voltage() <= 23500) /*A2*/ if (RTE_Read_KL15_Voltage() <= (23500 - 800)) /*A2*/
{ {
if (LOW_VOLTAGE_TIME1 <= 3500) if (LOW_VOLTAGE_TIME1 <= 3500)
LOW_VOLTAGE_TIME1++; LOW_VOLTAGE_TIME1++;
...@@ -332,7 +332,7 @@ void Common_Input_Para(void) ...@@ -332,7 +332,7 @@ void Common_Input_Para(void)
LOW_VOLTAGE_TIME1 = 0; LOW_VOLTAGE_TIME1 = 0;
} }
if (RTE_Read_KL15_Voltage() >= 25000) /*A2*/ if (RTE_Read_KL15_Voltage() >= (25000 - 800)) /*A2*/
{ {
if (LOW_VOLTAGE_TIME2 <= 5000) if (LOW_VOLTAGE_TIME2 <= 5000)
LOW_VOLTAGE_TIME2++; LOW_VOLTAGE_TIME2++;
...@@ -344,7 +344,7 @@ void Common_Input_Para(void) ...@@ -344,7 +344,7 @@ void Common_Input_Para(void)
LOW_VOLTAGE_TIME2 = 0; LOW_VOLTAGE_TIME2 = 0;
} }
// //
if (RTE_Read_KL15_Voltage() >= 30400) /*A2*/ if (RTE_Read_KL15_Voltage() >= (30400 - 800)) /*A2*/
{ {
if (HIGH_VOLTAGE_TIME1 <= 3500) if (HIGH_VOLTAGE_TIME1 <= 3500)
HIGH_VOLTAGE_TIME1++; HIGH_VOLTAGE_TIME1++;
...@@ -356,7 +356,7 @@ void Common_Input_Para(void) ...@@ -356,7 +356,7 @@ void Common_Input_Para(void)
HIGH_VOLTAGE_TIME1 = 0; HIGH_VOLTAGE_TIME1 = 0;
} }
if (RTE_Read_KL15_Voltage() <= 29400) /*A2*/ if (RTE_Read_KL15_Voltage() <= (29400 - 800)) /*A2*/
{ {
if (HIGH_VOLTAGE_TIME2 <= 5000) if (HIGH_VOLTAGE_TIME2 <= 5000)
HIGH_VOLTAGE_TIME2++; HIGH_VOLTAGE_TIME2++;
......
source/Driver/Graphic/images.c
View file @ 87249c1a
...@@ -229,7 +229,7 @@ static const t_PicStruct Pic_Attribute[] = ...@@ -229,7 +229,7 @@ static const t_PicStruct Pic_Attribute[] =
{ /*CN_Alarm_drive_44_wenzi1_4 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103E7680u }, { /*CN_Alarm_drive_44_wenzi1_4 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103E7680u },
{ /*CN_Alarm_drive_44_wenzi1_5 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103EEBC0u }, { /*CN_Alarm_drive_44_wenzi1_5 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103EEBC0u },
{ /*CN_Alarm_drive_44_wenzi1_7 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103F6100u }, { /*CN_Alarm_drive_44_wenzi1_7 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103F6100u },
{ /*CN_Alarm_drive_44_wenzi2 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x103FD640u }, { /*CN_Alarm_drive_44_wenzi2 X390_Y276.png*/ 390u, 276u, 400u, 44u, ARGB8888, 0x103FD640u },
{ /*CN_Alarm_drive_44_wenzi2_1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x1040E940u }, { /*CN_Alarm_drive_44_wenzi2_1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x1040E940u },
{ /*CN_Alarm_drive_05_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10415E80u }, { /*CN_Alarm_drive_05_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10415E80u },
{ /*CN_Alarm_drive_05_wenzi X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1041CF00u }, { /*CN_Alarm_drive_05_wenzi X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1041CF00u },
......
source/System/tasks.c
View file @ 87249c1a
...@@ -260,7 +260,6 @@ void Sys_Exact_50us_Tasks(void) ...@@ -260,7 +260,6 @@ void Sys_Exact_50us_Tasks(void)
SEG_LCD_Window_Control_Service(); SEG_LCD_Window_Control_Service();
} }
Buzzer_Play_ISR(); Buzzer_Play_ISR();
Data_Mileage_ISR();
} }
/*============================================================================*/ /*============================================================================*/
...@@ -274,7 +273,7 @@ void Sys_Exact_50us_Tasks(void) ...@@ -274,7 +273,7 @@ void Sys_Exact_50us_Tasks(void)
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
void Sys_Exact_100ms_Tasks(void) void Sys_Exact_100ms_Tasks(void)
{ {
//Data_Mileage_ISR(); Data_Mileage_ISR();
Service_OFF_Timing_Process(); Service_OFF_Timing_Process();
Fuel_User_KL15_OFF_Processing_Service(); Fuel_User_KL15_OFF_Processing_Service();
} }
......
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