删除无用的按键操作函数

source/Application/APP/Key/Key_user.c

@@ -40,8 +40,6 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
     uint16_t DispVSpeed = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
-    HMI_Set_KEY_UP(enKeyEvent);
-
     HMI_MENU_Sta = Get_Cur_HMI();
 
     DispVSpeed = Common_Get_Disp_V_Speed();
@@ -534,8 +532,6 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
     uint16_t DispVSpeed = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
-    HMI_Set_KEY_DOWN(enKeyEvent);
-
     HMI_MENU_Sta = Get_Cur_HMI();
     DispVSpeed = Common_Get_Disp_V_Speed();
 
@@ -1047,8 +1043,6 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
     uint16_t DispVSpeed = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
-    HMI_Set_KEY_CONFIRM(enKeyEvent);
-
     HMI_MENU_Sta = Get_Cur_HMI();
     DispVSpeed = Common_Get_Disp_V_Speed();
 
@@ -1226,8 +1220,6 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
     uint16_t DispVSpeed = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
-    HMI_Set_KEY_CANCEL(enKeyEvent);
-
     HMI_MENU_Sta = Get_Cur_HMI();
     DispVSpeed = Common_Get_Disp_V_Speed();
 
@@ -1363,8 +1355,6 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
     uint16_t DispVSpeed = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
-    HMI_Set_KEY_MENU(enKeyEvent);
-
     HMI_MENU_Sta = Get_Cur_HMI();
     DispVSpeed = Common_Get_Disp_V_Speed();
 
@@ -1540,8 +1530,6 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
     UElib_uint16_t HMI_MENU_Sta = 0u;
     uint8_t PowerStatus;
 
-    HMI_Set_KEY_ODOTRIP(enKeyEvent);
-
     HMI_MENU_Sta = Get_Cur_HMI();
     DispVSpeed = Common_Get_Disp_V_Speed();
     PowerStatus = Common_Get_IG_Sts();

source/Application/Graphic/UE/DisplaySch_user.c

@@ -150,87 +150,6 @@ void DisplayServices(void)
     }
 
     DispSch_xxxMs_Logic(10u);
-#if 0
-    /*上短*/
-    if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP == KEY_EVENT_SHORT_PRESS_1)
-    {
-        HMI_Clear_KEY_UP();
-    }
-    /*上长*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP == KEY_EVENT_LONG_PRESS_1)
-    {
-        HMI_Clear_KEY_UP();
-    }
-    /*下短*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_DOWN == KEY_EVENT_SHORT_PRESS_1)
-    {
-        HMI_Clear_KEY_DOWN();
-    }
-    /*下长*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_DOWN == KEY_EVENT_LONG_PRESS_1)
-    {
-        HMI_Clear_KEY_DOWN();
-    }
-    /*确认短*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_CONFIRM == KEY_EVENT_SHORT_PRESS_1)
-    {
-        HMI_Clear_KEY_CONFIRM();
-    }
-    /*确认长*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_CONFIRM == KEY_EVENT_LONG_PRESS_1)
-    {
-        HMI_Clear_KEY_CONFIRM();
-    }
-    /*确认超长  3S*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_CONFIRM == KEY_EVENT_LONG_PRESS_2)
-    {
-        HMI_Clear_KEY_CONFIRM();
-    }
-    /*返回短*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_CANCEL == KEY_EVENT_SHORT_PRESS_1)
-    {
-        HMI_Clear_KEY_CANCEL();
-    }
-    /*返回长*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_CANCEL == KEY_EVENT_LONG_PRESS_1)
-    {
-        HMI_Clear_KEY_CANCEL();
-    }
-    /*MENU短*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU == KEY_EVENT_SHORT_PRESS_1)
-    {
-        HMI_Clear_KEY_MENU();
-    }
-    /*MENU长*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU == KEY_EVENT_LONG_PRESS_1)
-    {
-        HMI_Clear_KEY_MENU();
-    }
-    else
-    {
-        ; /*do nothing*/
-    }
-
-    /*ODOTrip短*/
-    if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_SHORT_PRESS_1)
-    {
-        HMI_Clear_KEY_ODOTRIP();
-    }
-    /*ODOTrip长*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_LONG_PRESS_1)
-    {
-        HMI_Clear_KEY_ODOTRIP();
-    }
-    /*ODO off-to-on*/
-    else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_OFF_TO_ON)
-    {
-        HMI_Clear_KEY_ODOTRIP();
-    }
-    else
-    {
-        ; /*do nothing*/
-    }
-#endif
 }
 
 /*----开机动画----*/
@@ -436,56 +355,6 @@ void GUI_DisplayServices(void)
     }
 }
 
-void HMI_Set_KEY_UP(uint8_t u8KeyVal)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP = u8KeyVal;
-}
-void HMI_Set_KEY_DOWN(uint8_t u8KeyVal)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_DOWN = u8KeyVal;
-}
-void HMI_Set_KEY_CONFIRM(uint8_t u8KeyVal)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_CONFIRM = u8KeyVal;
-}
-void HMI_Set_KEY_CANCEL(uint8_t u8KeyVal)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_CANCEL = u8KeyVal;
-}
-void HMI_Set_KEY_MENU(uint8_t u8KeyVal)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU = u8KeyVal;
-}
-void HMI_Set_KEY_ODOTRIP(uint8_t u8KeyVal)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP = u8KeyVal;
-}
-
-void HMI_Clear_KEY_UP(void)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP = 0u;
-}
-void HMI_Clear_KEY_DOWN(void)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_DOWN = 0u;
-}
-void HMI_Clear_KEY_CONFIRM(void)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_CONFIRM = 0u;
-}
-void HMI_Clear_KEY_CANCEL(void)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_CANCEL = 0u;
-}
-void HMI_Clear_KEY_MENU(void)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU = 0u;
-}
-void HMI_Clear_KEY_ODOTRIP(void)
-{
-    UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP = 0u;
-}
-
 void Meter_Mode_conversion(void)
 {
     uint16_t popupID = 0xFFFFu;

source/Application/Graphic/UE/DisplaySch_user.h

@@ -77,21 +77,7 @@ void Display_NothingService(void);
 
 void GUI_DisplayServices(void);
 
-void HMI_Set_KEY_UP(uint8_t u8KeyVal);
-void HMI_Set_KEY_DOWN(uint8_t u8KeyVal);
-void HMI_Set_KEY_CONFIRM(uint8_t u8KeyVal);
-void HMI_Set_KEY_CANCEL(uint8_t u8KeyVal);
-void HMI_Set_KEY_MENU(uint8_t u8KeyVal);
-void HMI_Set_KEY_ODOTRIP(uint8_t u8KeyVal);
-
-void HMI_Clear_KEY_UP(void);
-void HMI_Clear_KEY_DOWN(void);
-void HMI_Clear_KEY_CONFIRM(void);
-void HMI_Clear_KEY_CANCEL(void);
-void HMI_Clear_KEY_MENU(void);
-void HMI_Clear_KEY_ODOTRIP(void);
 void Meter_Mode_conversion(void);
-
 uint16_t Common_GetHMI_StartAnimationFrameCnt(void);
 
 #endif