Skip to content

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

按照新版功能调整功能

parent 7a8f8c34
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 747 additions and 406 deletions
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ 1a547abb
......@@ -1017,7 +1017,7 @@ static void Seg_General_Digit_Display(uint32_t Digit, uint8_t Len, uint8_t Blank
static uint8_t wbyTestSeg = 0;
static uint16_t wbyTestNum;
static uint8_t IC_TEST = 1;
static uint8_t IC_TEST = 0;
/******************************************************************************
Seg_Display_Service 在 20MS任务中
信号接口：
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 1a547abb
......@@ -56,7 +56,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0xFFu, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
3000ul,
0x18FE5BE8ul,
(( void * )0),
(( void * )0),
......@@ -106,7 +106,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{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,
3000ul,
0xCF02F2Aul,
(( void * )0),
(( void * )0),
......@@ -116,7 +116,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{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,
3000ul,
0xCF02FA1ul,
(( void * )0),
(( void * )0),
......@@ -126,7 +126,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{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,
3000ul,
0xCF02FA0ul,
(( void * )0),
(( void * )0),
......@@ -432,6 +432,36 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
(( 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,
0x18FECA2Au,
(( 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,
0x18FECAA1u,
(( 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,
0x18FECAA0u,
(( void * )0),
(( void * )0),
(( void * )0),
},
};
uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void)
......@@ -981,6 +1011,21 @@ uint8_t Get_ID_18FECA03_Sig_FMI(void)
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 4u) >> 0u) & 0x1Fu);
}
uint8_t Get_ID_18FECA2A_Sig_AebsOff(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECA2A_Msg_Count, 0u) >> 2u) & 0x03u);
}
uint8_t Get_ID_18FECAA1_Sig_AebsOff(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECAA1_Msg_Count, 0u) >> 2u) & 0x03u);
}
uint8_t Get_ID_18FECAA0_Sig_AebsOff(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECAA0_Msg_Count, 0u) >> 2u) & 0x03u);
}
uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
{
uint8_t u8Result = ID_TOTAL_MAX;
......@@ -1109,6 +1154,15 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case ID_CanMsg0C010305_Msg:
u8Result = ID_CanMsg0C010305_Msg_Count;
break;
case ID_CanMsg18FECA2A_Msg:
u8Result = ID_CanMsg18FECA2A_Msg_Count;
break;
case ID_CanMsg18FECAA1_Msg:
u8Result = ID_CanMsg18FECAA1_Msg_Count;
break;
case ID_CanMsg18FECAA0_Msg:
u8Result = ID_CanMsg18FECAA0_Msg_Count;
break;
default :
u8Result = ID_TOTAL_MAX;
break;
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @ 1a547abb
......@@ -47,6 +47,9 @@ typedef enum
ID_CanMsg18EA0021_Msg_Count,
ID_CanMsg18021733_Msg_Count,
ID_CanMsg0C010305_Msg_Count,
ID_CanMsg18FECA2A_Msg_Count,
ID_CanMsg18FECAA1_Msg_Count,
ID_CanMsg18FECAA0_Msg_Count,
ID_TOTAL_MAX,
} CAN_MSG_ID_t;
......@@ -115,6 +118,9 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define ID_CanMsg18EA0021_Msg 0x18EA0021u
#define ID_CanMsg18021733_Msg 0x18021733u
#define ID_CanMsg0C010305_Msg 0x0C010305u
#define ID_CanMsg18FECA2A_Msg 0x18FECA2Au
#define ID_CanMsg18FECAA1_Msg 0x18FECAA1u
#define ID_CanMsg18FECAA0_Msg 0x18FECAA0u
extern uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void);
extern uint8_t Get_ID_18FF2300_Sig_EXH_System(void);
......@@ -223,6 +229,9 @@ extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void);
extern uint32_t Get_ID_18FECA03_Sig_SPN(void);
extern uint8_t Get_ID_18FECA03_Sig_FMI(void);
extern uint8_t Get_ID_18FECA2A_Sig_AebsOff(void);
extern uint8_t Get_ID_18FECAA1_Sig_AebsOff(void);
extern uint8_t Get_ID_18FECAA0_Sig_AebsOff(void);
extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID);
......
source/Application/Graphic/GUI/GUI.c
View file @ 1a547abb
......@@ -6287,10 +6287,6 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
}
}
void Loc_Display_Blue(void)
{
loc_Disable_Window_App();
......@@ -6298,4 +6294,186 @@ void Loc_Display_Blue(void)
R_WM_ScreenBgColorSet(0, 0, 0, 0Xff);
R_WM_FrameEndMark(0, 0);
R_WM_FrameWait(0, 0);
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu1_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
if (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_4)
{
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_1)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_01White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_2)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_02White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_3)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_4)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else if (bCurMenuIDX == _FAC_DSP_LEVEL1MENU_5)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_02White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_09White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_01black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_02black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_07black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu5_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_09black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu6_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_06black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ 1a547abb
This diff is collapsed.
source/Application/Graphic/Menu/Menu.h
View file @ 1a547abb
......@@ -510,4 +510,44 @@ EXTERN_MEU_PROCESS void Level_Return_Menu_Enter(void);
EXTERN_MEU_PROCESS void Level_Return_Menu_Do(void);
EXTERN_MEU_PROCESS void Level_Return_Menu_Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void);
#endif
source/Application/Graphic/Menu/Menu_user.c
View file @ 1a547abb
......@@ -120,17 +120,17 @@ const _MenuOptTab MenuOptTab[] =
/*78*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_4, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*工厂模式*/
/*79*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*80*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*81*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*82*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*83*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*84*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*85*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*86*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*87*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*79*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit},
/*80*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*81*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit},
/*82*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit},
/*83*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit},
/*84*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit},
/*85*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*86*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*87*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
......@@ -1586,4 +1586,118 @@ void Level_Return_Menu_Do(void)
void Level_Return_Menu_Exit(void)
{
State_Flag.ENTER_RETURN = 0;
}
\ No newline at end of file
}
/*----工厂模式----*/
/*----工厂模式----DTC显示-----*/
void LevelF1Menu_1Enter(void)
{}
void LevelF1Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu1_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_1Exit(void)
{}
/*----工厂模式----DTC清除-----*/
void LevelF1Menu_2Enter(void)
{}
void LevelF1Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu2_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_2Exit(void)
{}
/*----工厂模式----仪表设定显示-----*/
void LevelF1Menu_3Enter(void)
{}
void LevelF1Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu3_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_3Exit(void)
{}
/*----工厂模式----D暂时通常模式-----*/
void LevelF1Menu_4Enter(void)
{}
void LevelF1Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_4Exit(void)
{}
/*----工厂模式----结束工厂模式-----*/
void LevelF1Menu_5Enter(void)
{}
void LevelF1Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu5_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_5Exit(void)
{}
/*----工厂模式----HID自动水平初始化-----*/
void LevelF1Menu_6Enter(void)
{}
void LevelF1Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu6_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_6Exit(void)
{}
/**/
/*----工厂模式----DTC显示----发动机故障*-----*/
void LevelF1_1Menu_1Enter(void)
{}
void LevelF1_1Menu_1Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_1Exit(void)
{}
/*----工厂模式----DTC显示----SCR系统故障*-----*/
void LevelF1_1Menu_2Enter(void)
{}
void LevelF1_1Menu_2Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_2Exit(void)
{}
/*----工厂模式----DTC显示----EBS/ABS故障*-----*/
void LevelF1_1Menu_3Enter(void)
{}
void LevelF1_1Menu_3Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_3Exit(void)
{}
/*----工厂模式----DTC显示----仪表故障*-----*/
void LevelF1_1Menu_4Enter(void)
{}
void LevelF1_1Menu_4Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_4Exit(void)
{}
\ No newline at end of file
source/Application/Sound_Alarm/Sound_Source.h
View file @ 1a547abb
......@@ -79,34 +79,34 @@ typedef struct
static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
{
/*================================================================================================
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
------------------------------------------------------------------------------------------------*/
{/*00 SND_SRC_Key_Notremoved */ 0x01u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000U, },/*00 1HZ 忘拔钥匙 */
{/*01 SND_SRC_Braking */ 0x02u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*01 连续 制动 */
{/*02 SND_SRC_Air_Brake */ 0x03u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*02 连续 制动气压 */
{/*03 SND_SRC_BRAKE_LOCK */ 0x04u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*03 BRAKE LOCK */
{/*04 SND_SRC_Parking_Brake */ 0x05u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*04 停车制动忘记复位*/
{/*05 SND_SRC_Car_Dump_SPEED */ 0x06u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*05 车厢报警自卸蜂鸣器*/
{/*06 SND_SRC_Temp_High */ 0x07u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*06 连续 水温过热 */
{/*07 SND_SRC_Coolant_Low */ 0x08u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*07 连续 冷却水量 */
{/*08 SND_SRC_Oil_pressure_Low*/ 0x09u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*08 -(预留：油压)*/
{/*09 SND_SRC_ACC_AIR */ 0x0au, 10, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*09 连续 ACC AIR */
{/*10 SND_SRC_BackUP_SPEED */ 0x0bu, 11, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000U, },/*10 1HZ 倒车警报 */
{/*11 SND_SRC_DS_SPEED */ 0x00u, 12, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*11 DS 警报 */
{/*12 SND_SRC_ROWS_SPEED */ 0x00u, 13, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ 0x00u, 14, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ 0x00u, 15, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*14 4HZ EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x00u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*15 1HZ 3 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x00u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*15 2HZ 3 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x00u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*15 4HZ 3 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x00u, 19, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*18 4HZ 气悬车高调整 */
{/*18 SND_SRC_Cyclone_High */ 0x00u, 19, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*18 0.5HZ 气悬车高调整 */
{/*19 SND_SRC_SEATBELT_SPEED */ 0x00u, 20, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*19 2HZ 安全带 */
{/*20 SND_SRC_Fuel_Saving */ 0x00u, 21, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*20 1HZ省油耗建议 */
{/*21 SND_SRC_TICK */ 0x05u, 22, 1, SND_MODE_SINGLE, 100U, },
{/*22 SND_SRC_TOCK */ 0x06u, 23, 1, SND_MODE_SINGLE, 100U, },
{/*00 SND_SRC_Key_Notremoved */ 0x03u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*00 1HZ 4 忘拔钥匙 */
{/*01 SND_SRC_Braking */ 0x00u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*01 连续 1 制动 */
{/*02 SND_SRC_Air_Brake */ 0x01u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*02 连续 2 制动气压 */
{/*03 SND_SRC_BRAKE_LOCK */ 0x04u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*03 BRAKE LOCK */
{/*04 SND_SRC_Parking_Brake */ 0x05u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*04 停车制动忘记复位*/
{/*05 SND_SRC_Car_Dump_SPEED */ 0x06u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*05 车厢报警自卸蜂鸣器*/
{/*06 SND_SRC_Temp_High */ 0x01u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*06 连续 2 水温过热 */
{/*07 SND_SRC_Coolant_Low */ 0x00u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*07 连续 1 冷却水量 */
{/*08 SND_SRC_Oil_pressure_Low*/ 0x09u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*08 -(预留：油压)*/
{/*09 SND_SRC_ACC_AIR */ 0x01u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*09 连续 2 ACC AIR */
{/*10 SND_SRC_BackUP_SPEED */ 0x04u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*10 1HZ 5 倒车警报 */
{/*11 SND_SRC_DS_SPEED */ 0x00u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*11 DS 警报 */
{/*12 SND_SRC_ROWS_SPEED */ 0x00u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ 0x00u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ 0x01u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*14 4HZ 2 EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*15 4HZ 4 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*18 4HZ 4 气悬车高调整 */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 2000u, },/*18 0.5HZ 4 气悬车高调整 */
{/*19 SND_SRC_SEATBELT_SPEED */ 0x02u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*19 2HZ 3 安全带 */
{/*20 SND_SRC_Fuel_Saving */ 0x03u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*20 1HZ 4 省油耗建议 */
{/*21 SND_SRC_TICK */ 0x0Du, 2, 1, SND_MODE_SINGLE, 100u, },
{/*22 SND_SRC_TOCK */ 0x0Eu, 3, 1, SND_MODE_SINGLE, 100u, },
/*==============================================================================================*/
};
......
source/Driver/Buzzer/Sound_Tracks.h
View file @ 1a547abb
......@@ -37,6 +37,151 @@ typedef struct
******************************************************************************/
static const SndTrackStruct SndTracks[] =
{
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
000 | 1000ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
001 | 500ms | BUZZER_Track_Index_2300hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
002 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 280, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
003 | 500ms | BUZZER_Track_Index_2300hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 280, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
004 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 190, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
005 | 500ms | BUZZER_Track_Index_2600hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2600, 167, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
006 | 500ms | BUZZER_Track_Index_2000hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2000, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
007 | 500ms | BUZZER_Track_Index_800hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
......
source/System/tasks.c
View file @ 1a547abb
......@@ -140,9 +140,9 @@ void Sys_Run_Mode_10ms_Tasks(void)
Data_Mileage_Write_EEPROM();
Line_In_Debounce_Service();
Popup_Alone_Sound_Server();
//Telltales_Left_Right_Management_Service();
//Telltales_Management();
Test_LED_AllLight();
Telltales_Left_Right_Management_Service();
Telltales_Management();
//Test_LED_AllLight();
Key_Service();
CAN_BUSOFF_Recover();
......
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