Skip to content

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

增加CAN报文，调整系统演示模式显示界面

parent 29a4dcd6
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 44 deletions
source/Application/APP/Key/Key_user.c
View file @ 890d28e9
...@@ -663,6 +663,12 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -663,6 +663,12 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
} }
} }
/*系统演示模式*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL3_5_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_5_MENU_4))
{
MenuFlag.Menu_Return = 0;
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
}
/*Enter Go*/ /*Enter Go*/
else if (bCurMenuIDX == _MN_DSP_ENTER_MENU) else if (bCurMenuIDX == _MN_DSP_ENTER_MENU)
{ {
...@@ -732,6 +738,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -732,6 +738,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
NextMenu(MenuFlag.Menu_Flag); NextMenu(MenuFlag.Menu_Flag);
} }
} }
else if ((bCurMenuIDX >= _MN_DSP_LEVEL3_5_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_5_MENU_4))
{
NextMenu(MenuFlag.Menu_Flag);
}
} }
} }
else else
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 890d28e9
...@@ -422,6 +422,16 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -422,6 +422,16 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
}, },
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x0C010305ul,
(( void * )0),
(( void * )0),
(( void * )0),
},
}; };
uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void) uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void)
...@@ -959,6 +969,11 @@ uint8_t Get_ID_18021733_Sig_Setup_cmd(void) ...@@ -959,6 +969,11 @@ uint8_t Get_ID_18021733_Sig_Setup_cmd(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18021733_Msg_Count, 0u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18021733_Msg_Count, 0u) >> 0u) & 0xFFu));
} }
uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg0C010305_Msg_Count, 5u) >> 2u) & 0x03u));
}
uint8_t Co_Can_ConvertSubID(uint32_t MsgID) uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
{ {
uint8_t u8Result = ID_TOTAL_MAX; uint8_t u8Result = ID_TOTAL_MAX;
...@@ -1084,6 +1099,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -1084,6 +1099,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case ID_CanMsg18021733_Msg: case ID_CanMsg18021733_Msg:
u8Result = ID_CanMsg18021733_Msg_Count; u8Result = ID_CanMsg18021733_Msg_Count;
break; break;
case ID_CanMsg0C010305_Msg:
u8Result = ID_CanMsg0C010305_Msg_Count;
break;
default : default :
u8Result = ID_TOTAL_MAX; u8Result = ID_TOTAL_MAX;
break; break;
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @ 890d28e9
...@@ -46,6 +46,7 @@ typedef enum ...@@ -46,6 +46,7 @@ typedef enum
ID_CanMsg18FEED00_Msg_Count, ID_CanMsg18FEED00_Msg_Count,
ID_CanMsg18EA0021_Msg_Count, ID_CanMsg18EA0021_Msg_Count,
ID_CanMsg18021733_Msg_Count, ID_CanMsg18021733_Msg_Count,
ID_CanMsg0C010305_Msg_Count,
ID_TOTAL_MAX, ID_TOTAL_MAX,
} CAN_MSG_ID_t; } CAN_MSG_ID_t;
...@@ -113,6 +114,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -113,6 +114,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define ID_CanMsg18FEED00_Msg 0x18FEED00u #define ID_CanMsg18FEED00_Msg 0x18FEED00u
#define ID_CanMsg18EA0021_Msg 0x18EA0021u #define ID_CanMsg18EA0021_Msg 0x18EA0021u
#define ID_CanMsg18021733_Msg 0x18021733u #define ID_CanMsg18021733_Msg 0x18021733u
#define ID_CanMsg0C010305_Msg 0x0C010305u
extern uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void); extern uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void);
extern uint8_t Get_ID_18FF2300_Sig_EXH_System(void); extern uint8_t Get_ID_18FF2300_Sig_EXH_System(void);
...@@ -219,6 +221,7 @@ extern uint8_t Get_ID_18FECAE8_Sig_Amber_Warning_Lamp_Status(void); ...@@ -219,6 +221,7 @@ extern uint8_t Get_ID_18FECAE8_Sig_Amber_Warning_Lamp_Status(void);
extern uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void); extern uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void);
extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void); extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
extern uint8_t Get_ID_18021733_Sig_Setup_cmd(void); extern uint8_t Get_ID_18021733_Sig_Setup_cmd(void);
extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void);
extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID); extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID);
......
source/Application/Graphic/GUI/GUI.c
View file @ 890d28e9
...@@ -937,6 +937,43 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -937,6 +937,43 @@ void Gui_ADAS_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : Gui_ADAS_Test_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域 4
--------------------------------------------------------------------------*/
void Gui_ADAS_Test_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*刷文字“ADAS”：*/
GUI_General_Display(ADAS_Sprite, CN_ADAS_wenzi, GUI_BLENDMODE_SRC_OVER);
/*刷4个绿色的边框框角：*/
GUI_General_Display(ADAS_Sprite, CN_jiao1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_jiao2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_jiao3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_jiao4, GUI_BLENDMODE_SRC_OVER);
/*车*/
GUI_General_Display(ADAS_Sprite, CN_che, GUI_BLENDMODE_CUSTOM);
/*道*/
GUI_General_Display(ADAS_Sprite, CN_Road1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_LeftRoad, GUI_BLENDMODE_CUSTOM); /*绿*/
GUI_General_Display(ADAS_Sprite, CN_RightRoad, GUI_BLENDMODE_CUSTOM); /*绿*/
GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 125u, 257u, GUI_BLENDMODE_CUSTOM); /*左叹号*/
GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 339u, 257u, GUI_BLENDMODE_CUSTOM); /*右叹号*/
}
else
{
GUI_General_Display(ADAS_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : Gui_DrivingSupport_Display * Function Name : Gui_DrivingSupport_Display
* Description : * Description :
...@@ -1077,6 +1114,8 @@ void Gui_Gear_Display(uint8_t Mode) ...@@ -1077,6 +1114,8 @@ void Gui_Gear_Display(uint8_t Mode)
uint8_t Temp = 0u; uint8_t Temp = 0u;
uint8_t Automatic_or_Manual_Mode = 0u; uint8_t Automatic_or_Manual_Mode = 0u;
uint8_t CanStatus1 = 0u; uint8_t CanStatus1 = 0u;
uint8_t CanStatus2 = 0u;
uint8_t Auto_EcoPow = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
...@@ -1145,17 +1184,28 @@ void Gui_Gear_Display(uint8_t Mode) ...@@ -1145,17 +1184,28 @@ void Gui_Gear_Display(uint8_t Mode)
/*G2*/ /*G2*/
Automatic_or_Manual_Mode = Get_ID_18FF8503_Sig_Automatic_or_Manual_Mode(); Automatic_or_Manual_Mode = Get_ID_18FF8503_Sig_Automatic_or_Manual_Mode();
if (CanStatus1 == CAN_SIG_LOST) Auto_EcoPow = Get_ID_0C010305_Sig_Auto_EcoPow();
CanStatus2 = CAN_MSG_Status(ID_CanMsg0C010305_Msg_Count);
if ((CanStatus1 == CAN_SIG_LOST) && (CanStatus2 == CAN_SIG_LOST))
{ {
GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*不显示*/ GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*不显示*/
} }
else if (Automatic_or_Manual_Mode == 0x00u) else if ((Automatic_or_Manual_Mode == 0x00u) && (CanStatus1 == CAN_SIG_NORMAL))
{ {
GUI_General_Display(Gear_Sprite, CN_MANUAL, GUI_BLENDMODE_SRC_OVER); /*显示MAUNAL*/ GUI_General_Display(Gear_Sprite, CN_MANUAL, GUI_BLENDMODE_SRC_OVER); /*显示MAUNAL*/
} }
else if (Automatic_or_Manual_Mode == 0x01u) //else if (Automatic_or_Manual_Mode == 0x01u) && (CanStatus1 == CAN_SIG_NORMAL))
//{
// GUI_General_Display(Gear_Sprite, CN_MANUAL, GUI_BLENDMODE_SRC_OVER); /*显示AUTO 无图*/
//}
else if ((Auto_EcoPow == 0x01u) && (CanStatus2 == CAN_SIG_NORMAL))
{
GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*显示A-ECO*/
}
else if ((Auto_EcoPow == 0x00u) && (CanStatus2 == CAN_SIG_NORMAL))
{ {
GUI_General_Display(Gear_Sprite, CN_MANUAL, GUI_BLENDMODE_SRC_OVER); /*显示AUTO 无图*/ GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*显示A-POWER*/
} }
else else
{ {
...@@ -1819,7 +1869,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode) ...@@ -1819,7 +1869,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_block_NULL_Display * Function Name : GUI_block_NULL_Display
* Description : 年月日显示 * Description :
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
...@@ -1838,6 +1888,65 @@ void GUI_block_NULL_Display(uint8_t Mode) ...@@ -1838,6 +1888,65 @@ void GUI_block_NULL_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_AEBS_Test1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_AEBS_Test1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_wenzi3, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_AEBS_Test2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_AEBS_Test2_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_wenzi5, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_AEBS_Test3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_AEBS_Test3_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_wenzi4, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_Menu_Display * Function Name : GUI_BG_Menu_Display
* Description : * Description :
...@@ -5731,4 +5840,6 @@ void Common_EOL_User_Server(void) ...@@ -5731,4 +5840,6 @@ void Common_EOL_User_Server(void)
State_Flag.User_LT_FLAG = 1; State_Flag.User_LT_FLAG = 1;
} }
} }
} }
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ 890d28e9
...@@ -207,6 +207,7 @@ void Gui_TRIPA_Display(uint8_t Mode); /*TRIPA*/ ...@@ -207,6 +207,7 @@ void Gui_TRIPA_Display(uint8_t Mode); /*TRIPA*/
void Gui_TRIPB_Display(uint8_t Mode); /*TRIPB*/ void Gui_TRIPB_Display(uint8_t Mode); /*TRIPB*/
void Gui_ODO_Display(uint8_t Mode); /*ODO*/ void Gui_ODO_Display(uint8_t Mode); /*ODO*/
void Gui_ADAS_Display(uint8_t Mode); /*ADAS*/ void Gui_ADAS_Display(uint8_t Mode); /*ADAS*/
void Gui_ADAS_Test_Display(uint8_t Mode); /*ADAS TEST*/
void Gui_DrivingSupport_Display(uint8_t Mode); /*定速巡航*/ void Gui_DrivingSupport_Display(uint8_t Mode); /*定速巡航*/
void Gui_Gear_Display(uint8_t Mode); /*挡位*/ void Gui_Gear_Display(uint8_t Mode); /*挡位*/
void GUI_AVG_FuelSpeed_Display(uint8_t Mode); /*平均车速，平均油耗*/ void GUI_AVG_FuelSpeed_Display(uint8_t Mode); /*平均车速，平均油耗*/
...@@ -218,6 +219,9 @@ void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速时间-油温*/ ...@@ -218,6 +219,9 @@ void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速时间-油温*/
void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转速时间-油温*/ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转速时间-油温*/
void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/ void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/
void GUI_block_NULL_Display(uint8_t Mode); /*……*/ void GUI_block_NULL_Display(uint8_t Mode); /*……*/
void GUI_AEBS_Test1_Display(uint8_t Mode); /*AEBS_TEST1*/
void GUI_AEBS_Test2_Display(uint8_t Mode); /*AEBS_TEST2*/
void GUI_AEBS_Test3_Display(uint8_t Mode); /*AEBS_TEST3*/
void GUI_BG_Menu_Display(uint8_t Mode); /*一级菜单项*/ void GUI_BG_Menu_Display(uint8_t Mode); /*一级菜单项*/
void GUI_BG_Menu1_Display(uint8_t Mode); /**/ void GUI_BG_Menu1_Display(uint8_t Mode); /**/
void GUI_BG_Menu2_Display(uint8_t Mode); /**/ void GUI_BG_Menu2_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu.h
View file @ 890d28e9
...@@ -97,23 +97,24 @@ typedef enum ...@@ -97,23 +97,24 @@ typedef enum
_MN_DSP_LEVEL3_4_MENU_47, /* 62 辅助驻车解除设定*/ _MN_DSP_LEVEL3_4_MENU_47, /* 62 辅助驻车解除设定*/
_MN_DSP_LEVEL3_4_MENU_5, /* 63 轮胎匹配画面*/ _MN_DSP_LEVEL3_4_MENU_5, /* 63 轮胎匹配画面*/
_MN_DSP_LEVEL3_5_MENU_1, /* 64 LDWS 警报演示*/
_MN_DSP_LEVEL3_5_MENU_2, /* 65 AEBS第1警报演示*/
_MN_DSP_LEVEL3_5_MENU_3, /* 66 AEBS第2警报演示*/
_MN_DSP_LEVEL3_5_MENU_4, /* 67 AEBS全力制动警报演示*/
/*四级菜单*/ /*四级菜单*/
_MN_DSP_LEVEL4_4_MENU_1, /* 68 速度设定-高速路*/ _MN_DSP_LEVEL4_4_MENU_1, /* 64 速度设定-高速路*/
_MN_DSP_LEVEL4_4_MENU_2, /* 69 速度设定-一般路*/ _MN_DSP_LEVEL4_4_MENU_2, /* 65 速度设定-一般路*/
_MN_DSP_LEVEL4_4_MENU_3, /* 70 发动机转速设定*/ _MN_DSP_LEVEL4_4_MENU_3, /* 66 发动机转速设定*/
_MN_DSP_LEVEL4_4_MENU_4, /* 71 急加速设定*/ _MN_DSP_LEVEL4_4_MENU_4, /* 67 急加速设定*/
_MN_DSP_LEVEL4_4_MENU_5, /* 72 急减速设定*/ _MN_DSP_LEVEL4_4_MENU_5, /* 68 急减速设定*/
_MN_DSP_LEVEL4_4_MENU_6, /* 73 长时间怠速设定*/ _MN_DSP_LEVEL4_4_MENU_6, /* 69 长时间怠速设定*/
_MN_DSP_LEVEL4_4_MENU_7, /* 74 辅助驻车解除设定*/ _MN_DSP_LEVEL4_4_MENU_7, /* 70 辅助驻车解除设定*/
/*特殊界面*/ /*特殊界面*/
_MN_DSP_ENTER_MENU, /* 75 确认*/ _MN_DSP_ENTER_MENU, /* 71 确认*/
_MN_DSP_RETURN_MENU, /* 76 返回*/ _MN_DSP_RETURN_MENU, /* 72 返回*/
_MN_DSP_LEVEL3_5_MENU_1, /* 73 LDWS 警报演示*/
_MN_DSP_LEVEL3_5_MENU_2, /* 74 AEBS第1警报演示*/
_MN_DSP_LEVEL3_5_MENU_3, /* 75 AEBS第2警报演示*/
_MN_DSP_LEVEL3_5_MENU_4, /* 76 AEBS全力制动警报演示*/
} _MenuCode; } _MenuCode;
typedef uint8_t _MENU_IDX; typedef uint8_t _MENU_IDX;
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 890d28e9
...@@ -61,10 +61,10 @@ const _MenuOptTab MenuOptTab[] = ...@@ -61,10 +61,10 @@ const _MenuOptTab MenuOptTab[] =
/*30*/{ _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}, /* _MN_DSP_LEVEL2_4_MENU_5 */ /*30*/{ _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}, /* _MN_DSP_LEVEL2_4_MENU_5 */
/*31*/{ _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}, /* _MN_DSP_LEVEL2_4_MENU_5 */ /*31*/{ _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}, /* _MN_DSP_LEVEL2_4_MENU_5 */
/*32*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_2, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_1Enter, Level2_5Menu_1Do, Level2_5Menu_1Exit}, /* _MN_DSP_LEVEL2_5_MENU_1 */ /*32*/{ _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}, /* _MN_DSP_LEVEL2_5_MENU_1 */
/*33*/{ _MN_IDX_NULL, _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}, /* _MN_DSP_LEVEL2_5_MENU_2 */ /*33*/{ _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}, /* _MN_DSP_LEVEL2_5_MENU_2 */
/*34*/{ _MN_IDX_NULL, _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}, /* _MN_DSP_LEVEL2_5_MENU_3 */ /*34*/{ _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}, /* _MN_DSP_LEVEL2_5_MENU_3 */
/*35*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_3, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_5, Level2_5Menu_4Enter, Level2_5Menu_4Do, Level2_5Menu_4Exit}, /* _MN_DSP_LEVEL2_5_MENU_4 */ /*35*/{ _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}, /* _MN_DSP_LEVEL2_5_MENU_4 */
/*36*/{ _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}, /* _MN_DSP_LEVEL2_6_MENU_1 */ /*36*/{ _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}, /* _MN_DSP_LEVEL2_6_MENU_1 */
/*37*/{ _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}, /* _MN_DSP_LEVEL2_6_MENU_2 */ /*37*/{ _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}, /* _MN_DSP_LEVEL2_6_MENU_2 */
...@@ -100,22 +100,22 @@ const _MenuOptTab MenuOptTab[] = ...@@ -100,22 +100,22 @@ const _MenuOptTab MenuOptTab[] =
/*63*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_5, Level3_4Menu_5Enter, Level3_4Menu_5Do, Level3_4Menu_5Exit}, /*63*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_5, Level3_4Menu_5Enter, Level3_4Menu_5Do, Level3_4Menu_5Exit},
/*64*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_1, Level3_5Menu_1Enter, Level3_5Menu_1Do, Level3_5Menu_1Exit},
/*65*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_2, Level3_5Menu_2Enter, Level3_5Menu_2Do, Level3_5Menu_2Exit},
/*66*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_3, Level3_5Menu_3Enter, Level3_5Menu_3Do, Level3_5Menu_3Exit},
/*67*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_4, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*四级菜单*/ /*四级菜单*/
/*68*/{ _MN_DSP_LEVEL3_4_MENU_41, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_41, Level4_4Menu_1Enter, Level4_4Menu_1Do, Level4_4Menu_1Exit}, /*64*/{ _MN_DSP_LEVEL3_4_MENU_41, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_41, Level4_4Menu_1Enter, Level4_4Menu_1Do, Level4_4Menu_1Exit},
/*69*/{ _MN_DSP_LEVEL3_4_MENU_42, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_42, Level4_4Menu_2Enter, Level4_4Menu_2Do, Level4_4Menu_2Exit}, /*65*/{ _MN_DSP_LEVEL3_4_MENU_42, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_42, Level4_4Menu_2Enter, Level4_4Menu_2Do, Level4_4Menu_2Exit},
/*70*/{ _MN_DSP_LEVEL3_4_MENU_43, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_43, Level4_4Menu_3Enter, Level4_4Menu_3Do, Level4_4Menu_3Exit}, /*66*/{ _MN_DSP_LEVEL3_4_MENU_43, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_43, Level4_4Menu_3Enter, Level4_4Menu_3Do, Level4_4Menu_3Exit},
/*71*/{ _MN_DSP_LEVEL3_4_MENU_44, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_44, Level4_4Menu_4Enter, Level4_4Menu_4Do, Level4_4Menu_4Exit}, /*67*/{ _MN_DSP_LEVEL3_4_MENU_44, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_44, Level4_4Menu_4Enter, Level4_4Menu_4Do, Level4_4Menu_4Exit},
/*72*/{ _MN_DSP_LEVEL3_4_MENU_45, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_45, Level4_4Menu_5Enter, Level4_4Menu_5Do, Level4_4Menu_5Exit}, /*68*/{ _MN_DSP_LEVEL3_4_MENU_45, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_45, Level4_4Menu_5Enter, Level4_4Menu_5Do, Level4_4Menu_5Exit},
/*73*/{ _MN_DSP_LEVEL3_4_MENU_46, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_46, Level4_4Menu_6Enter, Level4_4Menu_6Do, Level4_4Menu_6Exit}, /*69*/{ _MN_DSP_LEVEL3_4_MENU_46, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_46, Level4_4Menu_6Enter, Level4_4Menu_6Do, Level4_4Menu_6Exit},
/*74*/{ _MN_DSP_LEVEL3_4_MENU_47, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_47, Level4_4Menu_7Enter, Level4_4Menu_7Do, Level4_4Menu_7Exit}, /*70*/{ _MN_DSP_LEVEL3_4_MENU_47, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_47, Level4_4Menu_7Enter, Level4_4Menu_7Do, Level4_4Menu_7Exit},
/*75*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, Level_Enter_Menu_Enter, Level_Enter_Menu_Do, Level_Enter_Menu_Exit}, /*71*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, Level_Enter_Menu_Enter, Level_Enter_Menu_Do, Level_Enter_Menu_Exit},
/*76*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, Level_Return_Menu_Enter, Level_Return_Menu_Do, Level_Return_Menu_Exit}, /*72*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, Level_Return_Menu_Enter, Level_Return_Menu_Do, Level_Return_Menu_Exit},
/*73*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_1, Level3_5Menu_1Enter, Level3_5Menu_1Do, Level3_5Menu_1Exit},
/*74*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_2, Level3_5Menu_2Enter, Level3_5Menu_2Do, Level3_5Menu_2Exit},
/*75*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_3, Level3_5Menu_3Enter, Level3_5Menu_3Do, Level3_5Menu_3Exit},
/*76*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_4, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
}; };
void NextMenu(_MENU_IDX idx) void NextMenu(_MENU_IDX idx)
...@@ -1283,7 +1283,11 @@ void Level3_5Menu_1Enter(void) ...@@ -1283,7 +1283,11 @@ void Level3_5Menu_1Enter(void)
{} {}
void Level3_5Menu_1Do(void) void Level3_5Menu_1Do(void)
{ {
GUI_OftenShow_Display(); /*1238*/
Gui_ADAS_Test_Display(GUI_DISP_MODE_NORMAL);/*4*/
GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_NORMAL);/*5*/
Gui_DrivingSupport_Display(GUI_DISP_MODE_NORMAL);/*6*/
Gui_Gear_Display(GUI_DISP_MODE_NORMAL);/*7*/
} }
void Level3_5Menu_1Exit(void) void Level3_5Menu_1Exit(void)
{} {}
...@@ -1294,7 +1298,9 @@ void Level3_5Menu_2Enter(void) ...@@ -1294,7 +1298,9 @@ void Level3_5Menu_2Enter(void)
{} {}
void Level3_5Menu_2Do(void) void Level3_5Menu_2Do(void)
{ {
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_AEBS_Test1_Display(GUI_DISP_MODE_NORMAL);
} }
void Level3_5Menu_2Exit(void) void Level3_5Menu_2Exit(void)
{} {}
...@@ -1305,7 +1311,9 @@ void Level3_5Menu_3Enter(void) ...@@ -1305,7 +1311,9 @@ void Level3_5Menu_3Enter(void)
{} {}
void Level3_5Menu_3Do(void) void Level3_5Menu_3Do(void)
{ {
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_AEBS_Test2_Display(GUI_DISP_MODE_NORMAL);
} }
void Level3_5Menu_3Exit(void) void Level3_5Menu_3Exit(void)
{} {}
...@@ -1316,7 +1324,9 @@ void Level3_5Menu_4Enter(void) ...@@ -1316,7 +1324,9 @@ void Level3_5Menu_4Enter(void)
{} {}
void Level3_5Menu_4Do(void) void Level3_5Menu_4Do(void)
{ {
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_AEBS_Test3_Display(GUI_DISP_MODE_NORMAL);
} }
void Level3_5Menu_4Exit(void) void Level3_5Menu_4Exit(void)
{} {}
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 890d28e9
...@@ -210,7 +210,7 @@ void GUI_DisplayServices(void) ...@@ -210,7 +210,7 @@ void GUI_DisplayServices(void)
} }
else else
{ {
if (bCurMenuIDX > _MN_DSP_LEVEPOPUP) if ((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1))
{ {
loc_Del_Sprite(ADAS_Sprite, Gear_Sprite); loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
if (Common_Get_window_Sta() != 0u) if (Common_Get_window_Sta() != 0u)
......
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