Skip to content

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

调整演示模式显示功能

parent 29bb7dd8
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 18 deletions
source/Application/APP/Key/Key_user.c
View file @ a6d23568
......@@ -72,46 +72,83 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
/*系统演示模式*/
else if ((bCurMenuIDX == _MN_DSP_LEVEL2MENU_6) && (K_Line_Set.K_Line_LID27 != 0x01u) && (K_Line_Set.K_Line_LID28 != 0x01u))
{
NextMenu(_MN_DSP_LEVEL2MENU_4);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
}
/*系统演示模式子菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2_5_MENU_1) && (_MN_DSP_LEVEL2_5_MENU_4 <= _MN_DSP_LEVEL2_5_MENU_1))
{
/*if ()
{
}
else if ()
{
}
else if ()
{
}
else
{
}*/
}
/*保养通知设定 更换机油&机油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_1)
{
if (User_set_Num.User_FDJYLQQ == (uint32_t)K_Line_Set.K_Line_LID4F * 1000u)
{
User_set_Num.User_FDJYLQQ = 0u;
}
}
/*保养通知设定 更换燃油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_2)
{
if (User_set_Num.User_RYLQQ == (uint32_t)K_Line_User_RYLQQ * 1000u)
{
User_set_Num.User_RYLQQ = 0u;
}
}
/*保养通知设定 更换变速箱油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_3)
{
if (User_set_Num.User_BSXY == (uint32_t)K_Line_Set.K_Line_LID4A * 1000u)
{
User_set_Num.User_BSXY = 0u;
}
}
/*保养通知设定 更换差速器右*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_4)
{
if (User_set_Num.User_CSQY == (uint32_t)K_Line_Set.K_Line_LID4B * 1000u)
{
User_set_Num.User_CSQY = 0u;
}
}
/*保养通知设定 更换动力转向油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_6)
{
if (User_set_Num.User_DLZXY == (uint32_t)K_Line_Set.K_Line_LID4D * 1000u)
{
User_set_Num.User_DLZXY = 0u;
}
}
/*保养通知设定 轮胎换位.更换*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_7)
{
if (User_set_Num.User_LT == (uint32_t)K_Line_Set.K_Line_LID4E * 1000u)
{
User_set_Num.User_LT = 0u;
}
}
/*设置日期-年*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_11)
......@@ -222,9 +259,13 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_5)
{
if (User_set_Num.User_TpmsStatus == 0)
{
User_set_Num.User_TpmsStatus = 1;
}
if ((User_set_Num.User_TpmsStatus == 1) && (User_set_Num.User_Tpms < 12))
{
User_set_Num.User_Tpms++;
}
}
/*高速路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_1)
......@@ -377,43 +418,63 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
/*系统演示模式*/
if ((bCurMenuIDX == _MN_DSP_LEVEL2MENU_4) && (K_Line_Set.K_Line_LID27 != 0x01u) && (K_Line_Set.K_Line_LID28 != 0x01u))
{
NextMenu(_MN_DSP_LEVEL2MENU_6);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
}
/*保养通知设定 更换机油&机油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_1)
{
if (User_set_Num.User_FDJYLQQ == 0u)
{
User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u;
}
}
/*保养通知设定 更换燃油滤清器*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_2)
{
if (User_set_Num.User_RYLQQ == 0u)
{
User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u;
}
}
/*保养通知设定 更换变速箱油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_3)
{
if (User_set_Num.User_BSXY == 0u)
{
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u;
}
}
/*保养通知设定 更换差速器油*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_4)
{
if (User_set_Num.User_CSQY == 0u)
{
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u;
}
}
/*保养通知设定 更换动力转向液*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_6)
{
if (User_set_Num.User_DLZXY == 0u)
{
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u;
}
}
/*保养通知设定 轮胎换位.更换*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_3_MENU_7)
{
if (User_set_Num.User_LT == 0u)
{
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u;
}
}
/*设置日期-年*/
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_11)
......@@ -684,7 +745,22 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
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)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
/*系统演示模式*/
if (bCurMenuIDX == _MN_DSP_LEVEL2MENU_5)
{
if (K_Line_Set.K_Line_LID27 == 0x01u)
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
else
{
NextMenu(_MN_DSP_LEVEL2_5_MENU_2);
}
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
}
else if (((bCurMenuIDX >= _MN_DSP_LEVEL3_3_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_3)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL4_4_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL4_4_MENU_7)))
......
source/Application/Graphic/GUI/GUI.c
View file @ a6d23568
......@@ -2057,7 +2057,7 @@ void GUI_BG_Menu_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_SYSYS), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else
else if (bCurMenuIDX == _MN_DSP_LEVEL2MENU_6)
{
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_3)
{
......@@ -2069,13 +2069,24 @@ void GUI_BG_Menu_Display(uint8_t Mode)
}
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_5)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_SYSYS), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
if ((K_Line_Set.K_Line_LID27 != 0x01u) && (K_Line_Set.K_Line_LID28 != 0x01u))
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + 1u), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_SYSYS), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
}
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_6)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_06black + State_Flag.FState_TPMS), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{
;/*Do Nothing!*/
}
}
else
{
......
source/Application/Graphic/Menu/Menu.h
View file @ a6d23568
......@@ -60,13 +60,13 @@ typedef enum
_MN_DSP_LEVEL2_4_MENU_5, /* 31 TPMS轮胎设定*/
_MN_DSP_LEVEL2_4_MENU_6, /* 32 显示设定*/
_MN_DSP_LEVEL2_5_MENU_1, /* 33 LDWS 警报演示*/
_MN_DSP_LEVEL2_5_MENU_2, /* 34 AEBS第1警报演示*/
_MN_DSP_LEVEL2_5_MENU_3, /* 35 AEBS第2警报演示*/
_MN_DSP_LEVEL2_5_MENU_4, /* 36 AEBS全力制动警报演示*/
_MN_DSP_LEVEL2_6_MENU_1, /* 33 轮胎气压*/
_MN_DSP_LEVEL2_6_MENU_2, /* 34 轮胎温度*/
_MN_DSP_LEVEL2_6_MENU_1, /* 37 轮胎气压*/
_MN_DSP_LEVEL2_6_MENU_2, /* 38 轮胎温度*/
_MN_DSP_LEVEL2_5_MENU_1, /* 35 LDWS 警报演示*/
_MN_DSP_LEVEL2_5_MENU_2, /* 36 AEBS第1警报演示*/
_MN_DSP_LEVEL2_5_MENU_3, /* 37 AEBS第2警报演示*/
_MN_DSP_LEVEL2_5_MENU_4, /* 38 AEBS全力制动警报演示*/
/*三级菜单*/
_MN_DSP_LEVEL3_2_MENU_1, /* 39 发动机机油＆滤清器*/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ a6d23568
......@@ -62,13 +62,13 @@ const _MenuOptTab MenuOptTab[] =
/*31*/{ _MN_DSP_LEVEL3_4_MENU_5, _MN_DSP_LEVEL2_4_MENU_4, _MN_DSP_LEVEL2_4_MENU_6, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_5Enter, Level2_4Menu_5Do, Level2_4Menu_5Exit},
/*32*/{ _MN_IDX_NULL , _MN_DSP_LEVEL2_4_MENU_5, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_6Enter, Level2_4Menu_6Do, Level2_4Menu_6Exit},
/*33*/{ _MN_DSP_LEVEL3_5_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_2, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_1Enter, Level2_5Menu_1Do, Level2_5Menu_1Exit},
/*34*/{ _MN_DSP_LEVEL3_5_MENU_2, _MN_DSP_LEVEL2_5_MENU_1, _MN_DSP_LEVEL2_5_MENU_3, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_2Enter, Level2_5Menu_2Do, Level2_5Menu_2Exit},
/*35*/{ _MN_DSP_LEVEL3_5_MENU_3, _MN_DSP_LEVEL2_5_MENU_2, _MN_DSP_LEVEL2_5_MENU_4, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_3Enter, Level2_5Menu_3Do, Level2_5Menu_3Exit},
/*36*/{ _MN_DSP_LEVEL3_5_MENU_4, _MN_DSP_LEVEL2_5_MENU_3, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_4Enter, Level2_5Menu_4Do, Level2_5Menu_4Exit},
/*33*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_6_MENU_2, _MN_DSP_LEVEL2MENU_6, Level2_6Menu_1Enter, Level2_6Menu_1Do, Level2_6Menu_1Exit},
/*34*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2_6_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_6, Level2_6Menu_2Enter, Level2_6Menu_2Do, Level2_6Menu_2Exit},
/*37*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_6_MENU_2, _MN_DSP_LEVEL2MENU_6, Level2_6Menu_1Enter, Level2_6Menu_1Do, Level2_6Menu_1Exit},
/*38*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2_6_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_6, Level2_6Menu_2Enter, Level2_6Menu_2Do, Level2_6Menu_2Exit},
/*35*/{ _MN_DSP_LEVEL3_5_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_2, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_1Enter, Level2_5Menu_1Do, Level2_5Menu_1Exit},
/*36*/{ _MN_DSP_LEVEL3_5_MENU_2, _MN_DSP_LEVEL2_5_MENU_1, _MN_DSP_LEVEL2_5_MENU_3, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_2Enter, Level2_5Menu_2Do, Level2_5Menu_2Exit},
/*37*/{ _MN_DSP_LEVEL3_5_MENU_3, _MN_DSP_LEVEL2_5_MENU_2, _MN_DSP_LEVEL2_5_MENU_4, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_3Enter, Level2_5Menu_3Do, Level2_5Menu_3Exit},
/*38*/{ _MN_DSP_LEVEL3_5_MENU_4, _MN_DSP_LEVEL2_5_MENU_3, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_4Enter, Level2_5Menu_4Do, Level2_5Menu_4Exit},
/*三级菜单*/
/*39*/{_MN_DSP_ENTER_MENU, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_2_MENU_1, Level3_2Menu_1Enter, Level3_2Menu_1Do, Level3_2Menu_1Exit},
......
source/Application/RTE/RTE_CAN.c
View file @ a6d23568
......@@ -72,11 +72,11 @@ void Can_Init(void)
CANLLCCh0Filter.CH1_Std_Ext = 0u;
CANLLCCh0Filter.CH2_Std_Ext = 0u;
GPIO_OUT_PORT00_PIN00 = 0U; //RSCAN0_CH0_STB
CANSTB_OUT = 0U; //CANSTB_OUT
RSCAN0_CH_Init(&CANLLCCh0Filter, IDFilterNum);
Can_Init_Lock = 0x55AAu;
}
GPIO_OUT_PORT00_PIN00 = 0U; //RSCAN0_CH0_STB
CANSTB_OUT = 0U; //CANSTB_OUT
}
void Can_DeInit(void)
......
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