Skip to content

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

更换图片FLASH，增加工厂模式部分界面，增加按键，调整声音

parent ac7c34d8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 833 additions and 626 deletions
source/Application/APP/Key/Key.h
View file @ 6696766b
...@@ -22,6 +22,7 @@ typedef enum ...@@ -22,6 +22,7 @@ typedef enum
KEY_ENTER, KEY_ENTER,
KEY_RETURN, KEY_RETURN,
KEY_MENU, KEY_MENU,
KEY_ODOTRIP,
KEY_NUM_MAX, KEY_NUM_MAX,
} Key_Num_en_t; } Key_Num_en_t;
......
source/Application/APP/Key/Key_user.c
View file @ 6696766b
#include "Key.h" #include "Key.h"
#include "Menu.h" #include "Menu.h"
#include "GUI.h"
#include "CD4051.h"
#include "Services_ODO_User.h" #include "Services_ODO_User.h"
#include "DisplaySch_user.h" #include "DisplaySch_user.h"
...@@ -10,7 +12,6 @@ ...@@ -10,7 +12,6 @@
#include "RTE_ADC.h" #include "RTE_ADC.h"
#include "CAN_Communication_Matrix.h" #include "CAN_Communication_Matrix.h"
#include "GUI.h"
/*-------------------------------------------------------*/ /*-------------------------------------------------------*/
/*无车速限制值*/ /*无车速限制值*/
...@@ -23,20 +24,10 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent); ...@@ -23,20 +24,10 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent);
void Key_Operation_Up(Key_Event_en_t enKeyEvent); void Key_Operation_Up(Key_Event_en_t enKeyEvent);
void Key_Operation_Down(Key_Event_en_t enKeyEvent); void Key_Operation_Down(Key_Event_en_t enKeyEvent);
void Key_Operation_Menu(Key_Event_en_t enKeyEvent); void Key_Operation_Menu(Key_Event_en_t enKeyEvent);
void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent);
Key_IGN_en_t Key_Get_IGN_Status(void); Key_IGN_en_t Key_Get_IGN_Status(void);
struct
{
/* data */
uint8_t Up;
uint8_t Down;
uint8_t Enter;
uint8_t Menu;
uint8_t Return;
} KeyTest;
/*******************************UP*********************************************** /*******************************UP***********************************************
Function： Key_Operation_Up Function： Key_Operation_Up
Description： Description：
...@@ -67,13 +58,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -67,13 +58,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
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)) ||
((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)))
{ {
/*故障码*/
if ((CanStatus1 == CAN_SIG_LOST) && (bCurMenuIDX == _MN_DSP_LEVEL2MENU_2))
{
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)) 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); NextMenu(_MN_DSP_LEVEL2MENU_4);
} }
...@@ -1030,19 +1016,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -1030,19 +1016,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{ {
MenuFlag.Menu_Flag = bCurMenuIDX; MenuFlag.Menu_Flag = bCurMenuIDX;
/*有故障码*/
if (CanStatus1 == CAN_SIG_LOST)
{
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
/*无故障码*/
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
} }
}
/*无论从哪里都能回去*/ /*无论从哪里都能回去*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU)) else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{ {
// if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/ // if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
//{ //{
...@@ -1105,6 +1082,102 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -1105,6 +1082,102 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
} }
} }
/*******************************ODOTrip***********************************************
Function： Key_Operation_ODOTrip
Description：
Input:
Output:
*******************************ODOTrip***********************************************/
void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent)
{
uint16_t DispVSpeed = 0u;
UElib_uint16_t HMI_MENU_Sta = 0u;
HMI_Set_KEY_ODOTRIP(enKeyEvent);
HMI_MENU_Sta = Get_Cur_HMI();
DispVSpeed = Common_Get_Disp_V_Speed();
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
if (User_set_Num.Trip_Type == 0u)
{
User_set_Num.Trip_Type = 1u;
}
else
{
User_set_Num.Trip_Type = 0u;
}
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
if (User_set_Num.Trip_Type == 0u)
{
Data_Clear_Trip(EM_TRIP_A);
}
else
{
Data_Clear_Trip(EM_TRIP_B);
}
}
#if 0
if (DispVSpeed <= DISPSPEEDNULLMAX)
{
if (HMI_MENU_Sta != Display_Alarm)
{
/*----无车速，无报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
;
}
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!*/
}
}
}
else
{
if (HMI_MENU_Sta != Display_Alarm)
{
/*----有车速，无报警----*/
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!*/
}
}
}
#endif
}
uint8_t Common_Get_RetMenu_Flag(void) uint8_t Common_Get_RetMenu_Flag(void)
{ {
return MenuFlag.Menu_Flag; return MenuFlag.Menu_Flag;
...@@ -1271,14 +1344,34 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void) ...@@ -1271,14 +1344,34 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
return enKeyRealStatus; return enKeyRealStatus;
} }
/*TRIO-ODO*/
Key_Real_Status_en_t Key_Real_Status_Read_ODOTrip(void)
{
Key_Real_Status_en_t enKeyRealStatus = KEY_LINE_LOOSEN;
uint16_t Key_R = 0;
Key_R = (uint16_t)CD4051_COM3_X5_IN;
if (Key_R == 0u)
{
enKeyRealStatus = KEY_LINE_PRESS;
}
else
{
enKeyRealStatus = KEY_LINE_LOOSEN;
}
return enKeyRealStatus;
}
/*---------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------*/
const Key_Attribute_st_t stKeyAttribute[KEY_NUM_MAX] = const Key_Attribute_st_t stKeyAttribute[KEY_NUM_MAX] =
{ {
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Up, Key_Operation_Up}, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Up , Key_Operation_Up },
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down, Key_Operation_Down}, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down , Key_Operation_Down },
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Enter, Key_Operation_Enter}, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Enter , Key_Operation_Enter },
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return, Key_Operation_Return}, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return , Key_Operation_Return },
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Menu, Key_Operation_Menu}, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Menu , Key_Operation_Menu },
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_ODOTrip, Key_Operation_ODOTrip},
}; };
Key_IGN_en_t Key_Get_IGN_Status(void) Key_IGN_en_t Key_Get_IGN_Status(void)
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 6696766b
...@@ -161,46 +161,51 @@ void Can_Set_Buff_18FF3E17(uint8_t CopyData[]) ...@@ -161,46 +161,51 @@ void Can_Set_Buff_18FF3E17(uint8_t CopyData[])
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void Can_Set_Buff_18FED917(uint8_t CopyData[]) void Can_Set_Buff_18FED917(uint8_t CopyData[])
{ {
uint8_t Blanding_SW_Signal = 0u; uint8_t Blanding_SW_Signal = 0u;/*1 5-6*/
uint8_t Tralier_ABS_Fully_Operational = 0u; uint8_t Tralier_ABS_Fully_Operational = 0u;/*2 3-4*/
uint8_t Tlailer_ABS_Detect = 0u; uint8_t Tlailer_ABS_Detect = 0u;/*2 5-6*/
uint8_t Tlailer_Connected = 0u; uint8_t Tlailer_Connected = 0u; /*2 7-8*/
Blanding_SW_Signal = Line_In_Get_Status(LINE_IN_RET_BLENDING); /*A10*/ Blanding_SW_Signal = Line_In_Get_Status(LINE_IN_RET_BLENDING); /*A10*/
Tlailer_Connected = Line_In_Get_Status(LINE_IN_TRAILER_CONNECT); /*B6*/ Tralier_ABS_Fully_Operational = Line_In_Get_Status(LINE_IN_TRAILER_ABS); /*B33*/
if (Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 1u) if (Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 1u) /*B06*/
{ {
Tlailer_ABS_Detect = Line_In_Get_Status(LINE_IN_ABS_DETECT); /*A33*/ if ((Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO) == 1u) &&/*B03*/
(Line_In_Get_Status(LINE_IN_ABS_DETECT) == 1u)) /*A33*/
if (Line_In_Get_Status(LINE_IN_ABS_DETECT) == 1u)
{ {
Tralier_ABS_Fully_Operational = Line_In_Get_Status(LINE_IN_TRAILER_ABS); /*B33*/ Tlailer_ABS_Detect = 0u;
}
} }
else else
{ {
Tralier_ABS_Fully_Operational = 0u; if ((Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO) == 1u) && /*B03*/
} (Line_In_Get_Status(LINE_IN_ABS_DETECT) == 1u)) /*A33*/
{
Tlailer_ABS_Detect = 1u;
} }
else else if ((Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO) == 0u) && /*B03*/
(Line_In_Get_Status(LINE_IN_ABS_DETECT) == 0u)) /*A33*/
{ {
Tlailer_ABS_Detect = 3u; Tlailer_ABS_Detect = 0u;
Tralier_ABS_Fully_Operational = 3u; }
} }
Tlailer_Connected = Line_In_Get_Status(LINE_IN_TRAILER_CONNECT); /*B6*/
CopyData[0] = (uint8_t)(((Blanding_SW_Signal << 4u) & 0x30u) | CopyData[0] = (uint8_t)(((Blanding_SW_Signal << 4u) & 0x30u) |
0xCFu); /* 1 */ 0xCFu); /* 1 */
CopyData[1] = (uint8_t)(((Tralier_ABS_Fully_Operational << 2u) & 0x0Cu) | CopyData[1] = (uint8_t)(((Tralier_ABS_Fully_Operational << 2u) & 0x0Cu) |
((Tlailer_ABS_Detect << 4u) & 0x30u) | ((Tlailer_ABS_Detect << 4u) & 0x30u) |
((Tlailer_Connected << 6u) & 0xC0u) | ((Tlailer_Connected << 6u) & 0xC0u) |
0x03u); /* 2 */ 0x03u); /* 2 */
CopyData[2] = 0u; /* 3 */ CopyData[2] = 0xFFu; /* 3 */
CopyData[3] = 0u; /* 4 */ CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0u; /* 5 */ CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0u; /* 6 */ CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0u; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0u; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
......
source/Application/Graphic/GUI/GUI.c
View file @ 6696766b
...@@ -135,6 +135,7 @@ void GUI_Display_Value_Init(void) ...@@ -135,6 +135,7 @@ void GUI_Display_Value_Init(void)
User_App.User_Company = 1u ; User_App.User_Company = 1u ;
User_App.User_Light1 = K_Line_Set.ReservedB ; User_App.User_Light1 = K_Line_Set.ReservedB ;
User_App.User_Light2 = K_Line_Set.ReservedB ; User_App.User_Light2 = K_Line_Set.ReservedB ;
User_App.Trip_Type = 0u;
/*保养状态标识*/ /*保养状态标识*/
if (K_Line_Set.K_Line_LID4F) if (K_Line_Set.K_Line_LID4F)
...@@ -195,6 +196,7 @@ void GUI_Display_Value_Init(void) ...@@ -195,6 +196,7 @@ void GUI_Display_Value_Init(void)
User_set_Num.User_Company = User_App.User_Company ; User_set_Num.User_Company = User_App.User_Company ;
User_set_Num.User_Light1 = User_App.User_Light1 ; User_set_Num.User_Light1 = User_App.User_Light1 ;
User_set_Num.User_Light2 = User_App.User_Light2 ; User_set_Num.User_Light2 = User_App.User_Light2 ;
User_set_Num.Trip_Type = User_App.Trip_Type ;
User_App.User_Gsl = 0xFFu; User_App.User_Gsl = 0xFFu;
User_App.User_Ybl = 0xFFu; User_App.User_Ybl = 0xFFu;
...@@ -226,6 +228,8 @@ void GUI_OftenShow_Display(void) ...@@ -226,6 +228,8 @@ void GUI_OftenShow_Display(void)
{ {
uint8_t Trip_Type = 0u; uint8_t Trip_Type = 0u;
Trip_Type = User_set_Num.Trip_Type;
GUI_AC_Temp_Dispaly(GUI_DISP_MODE_BLANK); GUI_AC_Temp_Dispaly(GUI_DISP_MODE_BLANK);
GUI_Time_Dispaly(GUI_DISP_MODE_NORMAL); GUI_Time_Dispaly(GUI_DISP_MODE_NORMAL);
GUI_Data_Dispaly(GUI_DISP_MODE_NORMAL); GUI_Data_Dispaly(GUI_DISP_MODE_NORMAL);
...@@ -1247,6 +1251,8 @@ void GUI_AVG_FuelSpeed_Display(uint8_t Mode) ...@@ -1247,6 +1251,8 @@ void GUI_AVG_FuelSpeed_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
Trip_Type = User_set_Num.Trip_Type;
GUI_General_Display(MultiPurpose_Sprite, CN_TRIPAB, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MultiPurpose_Sprite, CN_TRIPAB, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu, GUI_BLENDMODE_SRC_OVER);
...@@ -3097,14 +3103,14 @@ void GUI_BG_DemoMenu4_Display(uint8_t Mode) ...@@ -3097,14 +3103,14 @@ void GUI_BG_DemoMenu4_Display(uint8_t Mode)
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_Errot_Display * Function Name : GUI_BG_DTCReading_Display
* Description : * Description :
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void GUI_BG_Errot_Display(uint8_t Mode) void GUI_BG_DTCReading_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
...@@ -3112,12 +3118,15 @@ void GUI_BG_Errot_Display(uint8_t Mode) ...@@ -3112,12 +3118,15 @@ void GUI_BG_Errot_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/ GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/ GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
GUI_Translate_Display(MENU_Sprite, CN_User_Menu2_01_1white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);/*故障码读取中*/
} }
else else
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_TPMS_GasPIC_Display * Function Name : GUI_BG_TPMS_GasPIC_Display
* Description : * Description :
...@@ -6477,3 +6486,90 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode) ...@@ -6477,3 +6486,90 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); 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_DTCEngine_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_03_image, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_05_wenzi, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 484u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 506u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 528u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_1, 550u, 305u, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DTCSCR_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DTCSCR_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_03_image, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 484u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 506u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 528u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_1, 550u, 305u, 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_DTCAMT_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_04_image, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_04_wenzi, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 484u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 506u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_0, 528u, 305u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_1, 550u, 305u, 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 @ 6696766b
...@@ -120,6 +120,10 @@ typedef struct ...@@ -120,6 +120,10 @@ typedef struct
uint8_t User_TpmsStatus; /* 当前胎压匹配界面 0 胎压未配置状态， 1 轮胎选中界面， 2 轮胎正在配置*/ uint8_t User_TpmsStatus; /* 当前胎压匹配界面 0 胎压未配置状态， 1 轮胎选中界面， 2 轮胎正在配置*/
uint8_t User_Temp_Return; /* 取消胎压配置 0 1 取消配对标记*/ uint8_t User_Temp_Return; /* 取消胎压配置 0 1 取消配对标记*/
uint8_t User_TpmsSend; /* 胎压匹配报文发送请求次数3 0 不发*/ uint8_t User_TpmsSend; /* 胎压匹配报文发送请求次数3 0 不发*/
uint8_t Trip_Type; /* */
uint8_t Reserve1;
uint8_t Reserve2;
uint8_t Reserve3;
} _UserSet; } _UserSet;
extern _UserSet User_set_Num; extern _UserSet User_set_Num;
...@@ -160,7 +164,7 @@ typedef struct ...@@ -160,7 +164,7 @@ typedef struct
报警显示表 报警显示表
*************************************************************************************************************/ *************************************************************************************************************/
static const GUIGeneralPopupStruct GUIGeneralPopupTable[] = static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{ {
/*----图标-----------------有车速-----------------------------------------------------------无车速-------------------------------------------*/ /*----图标-----------------有车速-----------------------------------------------------------无车速-------------------------------------------*/
{SpriteSize, CN_Alarm_01_wenzi1, SpriteSize, CN_Alarm_01_wenzi1, SpriteSize}, /*00.第一组 紧急警报-刹车*/ {SpriteSize, CN_Alarm_01_wenzi1, SpriteSize, CN_Alarm_01_wenzi1, SpriteSize}, /*00.第一组 紧急警报-刹车*/
{SpriteSize, CN_Alarm_01_wenzi4, SpriteSize, CN_Alarm_01_wenzi4, SpriteSize}, /*01. 紧急警报-紧急制动*/ {SpriteSize, CN_Alarm_01_wenzi4, SpriteSize, CN_Alarm_01_wenzi4, SpriteSize}, /*01. 紧急警报-紧急制动*/
...@@ -323,7 +327,7 @@ void GUI_BG_Menu3_Display(uint8_t Mode); /**/ ...@@ -323,7 +327,7 @@ void GUI_BG_Menu3_Display(uint8_t Mode); /**/
void GUI_BG_Menu4_Display(uint8_t Mode); /**/ void GUI_BG_Menu4_Display(uint8_t Mode); /**/
void GUI_BG_Menu5_Display(uint8_t Mode); /**/ void GUI_BG_Menu5_Display(uint8_t Mode); /**/
void GUI_BG_Menu6_Display(uint8_t Mode); /**/ void GUI_BG_Menu6_Display(uint8_t Mode); /**/
void GUI_BG_Errot_Display(uint8_t Mode); /*二级菜单--故障码显示*/ void GUI_BG_DTCReading_Display(uint8_t Mode); /*二级菜单--故障码显示*/
void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单--保养通知*/ void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单--保养通知*/
void GUI_BG_RepMenu1_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu1_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu2_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu2_Display(uint8_t Mode); /**/
...@@ -406,6 +410,9 @@ void GUI_BG_FacMenu3_Display(uint8_t Mode); /**/ ...@@ -406,6 +410,9 @@ void GUI_BG_FacMenu3_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu4_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu4_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu5_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu5_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu6_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu6_Display(uint8_t Mode); /**/
void GUI_BG_DTCEngine_Display(uint8_t Mode); /*发动机故障*/
void GUI_BG_DTCSCR_Display(uint8_t Mode); /*SCR故障*/
void GUI_BG_DTCAMT_Display(uint8_t Mode); /*AMT故障*/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu.h
View file @ 6696766b
...@@ -98,47 +98,52 @@ typedef enum ...@@ -98,47 +98,52 @@ typedef enum
_MN_DSP_LEVEL3_4_MENU_47, /* 63 辅助驻车解除设定*/ _MN_DSP_LEVEL3_4_MENU_47, /* 63 辅助驻车解除设定*/
_MN_DSP_LEVEL3_4_MENU_5, /* 64 轮胎匹配画面*/ _MN_DSP_LEVEL3_4_MENU_5, /* 64 轮胎匹配画面*/
_MN_DSP_LEVEL3_7_MENU_1, /* 65 亮度调节*/ _MN_DSP_LEVEL3_7_MENU_1, /* 65 亮度调节*/
_MN_DSP_LEVEL3_7_MENU_2, /* 65 亮度调节*/ _MN_DSP_LEVEL3_7_MENU_2, /* 66 亮度调节*/
/*四级菜单*/ /*四级菜单*/
_MN_DSP_LEVEL4_4_MENU_1, /* 66 速度设定-高速路*/ _MN_DSP_LEVEL4_4_MENU_1, /* 67 速度设定-高速路*/
_MN_DSP_LEVEL4_4_MENU_2, /* 67 速度设定-一般路*/ _MN_DSP_LEVEL4_4_MENU_2, /* 68 速度设定-一般路*/
_MN_DSP_LEVEL4_4_MENU_3, /* 68 发动机转速设定*/ _MN_DSP_LEVEL4_4_MENU_3, /* 69 发动机转速设定*/
_MN_DSP_LEVEL4_4_MENU_4, /* 69 急加速设定*/ _MN_DSP_LEVEL4_4_MENU_4, /* 70 急加速设定*/
_MN_DSP_LEVEL4_4_MENU_5, /* 70 急减速设定*/ _MN_DSP_LEVEL4_4_MENU_5, /* 71 急减速设定*/
_MN_DSP_LEVEL4_4_MENU_6, /* 71 长时间怠速设定*/ _MN_DSP_LEVEL4_4_MENU_6, /* 72 长时间怠速设定*/
_MN_DSP_LEVEL4_4_MENU_7, /* 72 辅助驻车解除设定*/ _MN_DSP_LEVEL4_4_MENU_7, /* 73 辅助驻车解除设定*/
/*特殊界面*/ /*特殊界面*/
_MN_DSP_ENTER_MENU, /* 73 确认*/ _MN_DSP_ENTER_MENU, /* 74 确认*/
_MN_DSP_RETURN_MENU, /* 74 返回*/ _MN_DSP_RETURN_MENU, /* 75 返回*/
_MN_DSP_LEVEL3_5_MENU_1, /* 75 LDWS 警报演示*/ _MN_DSP_LEVEL3_5_MENU_1, /* 76 LDWS 警报演示*/
_MN_DSP_LEVEL3_5_MENU_2, /* 76 AEBS第1警报演示*/ _MN_DSP_LEVEL3_5_MENU_2, /* 77 AEBS第1警报演示*/
_MN_DSP_LEVEL3_5_MENU_3, /* 77 AEBS第2警报演示*/ _MN_DSP_LEVEL3_5_MENU_3, /* 78 AEBS第2警报演示*/
_MN_DSP_LEVEL3_5_MENU_4, /* 78 AEBS全力制动警报演示*/ _MN_DSP_LEVEL3_5_MENU_4, /* 79 AEBS全力制动警报演示*/
/*工厂模式*/ /*工厂模式*/
_FAC_DSP_LEVEL1MENU_1, /* 79 DTC显示*/ _FAC_DSP_LEVEL1MENU_1, /* 80 DTC显示*/
_FAC_DSP_LEVEL1MENU_2, /* 80 DTC清除*/ _FAC_DSP_LEVEL1MENU_2, /* 81 DTC清除*/
_FAC_DSP_LEVEL1MENU_3, /* 81 仪表设定显示*/ _FAC_DSP_LEVEL1MENU_3, /* 82 仪表设定显示*/
_FAC_DSP_LEVEL1MENU_4, /* 82 暂时通常模式*/ _FAC_DSP_LEVEL1MENU_4, /* 83 暂时通常模式*/
_FAC_DSP_LEVEL1MENU_5, /* 83 结束工厂模式*/ _FAC_DSP_LEVEL1MENU_5, /* 84 结束工厂模式*/
_FAC_DSP_LEVEL1MENU_6, /* 84 HID自动水平初始化*/ _FAC_DSP_LEVEL1MENU_6, /* 85 HID自动水平初始化*/
_FAC_DSP_LEVEL1_1MENU_1, /* 85 发动机故障*/ _FAC_DSP_LEVEL1_1MENU_1, /* 86 故障码读取中*/
_FAC_DSP_LEVEL1_1MENU_2, /* 86 SCR系统故障*/
_FAC_DSP_LEVEL1_1MENU_3, /* 87 EBS/ABS故障*/
_FAC_DSP_LEVEL1_1MENU_4, /* 88 仪表故障*/
_FAC_DSP_LEVEL1_2MENU_1, /* 89 清除所有DTC*/ _FAC_DSP_LEVEL1_2MENU_1, /* 87 清除所有DTC*/
_FAC_DSP_LEVEL1_2MENU_2, /* 90 清除所有DTC*/ _FAC_DSP_LEVEL1_2MENU_2, /* 88 清除所有DTC*/
_FAC_DSP_LEVEL1_3MENU_1, /* 91 L0-7 H2-A*/ _FAC_DSP_LEVEL1_3MENU_1, /* 89 L0-7 H2-A*/
_FAC_DSP_LEVEL1_3MENU_2, /* 92 L8-F H2-A*/ _FAC_DSP_LEVEL1_3MENU_2, /* 90 L8-F H2-A*/
_FAC_DSP_LEVEL2_1MENU_1, /* 91 发动机故障*/
_FAC_DSP_LEVEL2_1MENU_2, /* 92 SCR系统故障*/
_FAC_DSP_LEVEL2_1MENU_3, /* 93 EBS/ABS故障*/
_FAC_DSP_LEVEL2_1MENU_4, /* 94 仪表故障*/
/*经销商模式*/ /*经销商模式*/
//_DIS_ //_DIS_
//
//
_MN_DSP_MENU_MAX,
} _MenuCode; } _MenuCode;
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 6696766b
This diff is collapsed.
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 6696766b
...@@ -84,8 +84,7 @@ void DisplayServices(void) ...@@ -84,8 +84,7 @@ void DisplayServices(void)
} }
else else
{ {
popupID = Popup_Get_Current_Message(); //popupID = Popup_Get_Current_Message();
if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u)) if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
{ {
...@@ -126,7 +125,7 @@ void DisplayServices(void) ...@@ -126,7 +125,7 @@ void DisplayServices(void)
if (DispVSpeed > 66u) if (DispVSpeed > 66u)
{ {
if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_5_MENU_4)) if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{ {
NextMenu(MenuFlag.Menu_Flag); NextMenu(MenuFlag.Menu_Flag);
} }
...@@ -201,6 +200,20 @@ void DisplayServices(void) ...@@ -201,6 +200,20 @@ void DisplayServices(void)
{ {
; /*do nothing*/ ; /*do nothing*/
} }
/*ODOTrip短*/
if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_SHORT_PRESS)
{
HMI_Clear_KEY_ODOTRIP();
}
/*ODOTrip长*/
else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_LONG_PRESS)
{
HMI_Clear_KEY_ODOTRIP();
}
else
{
; /*do nothing*/
}
} }
/*----开机动画----*/ /*----开机动画----*/
...@@ -291,7 +304,8 @@ void GUI_DisplayServices(void) ...@@ -291,7 +304,8 @@ void GUI_DisplayServices(void)
{ {
if (PowerStatus == COMMON_POWER_ON) if (PowerStatus == COMMON_POWER_ON)
{ {
if ((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
(bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_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)
...@@ -339,6 +353,10 @@ void HMI_Set_KEY_MENU(uint8_t u8KeyVal) ...@@ -339,6 +353,10 @@ void HMI_Set_KEY_MENU(uint8_t u8KeyVal)
{ {
UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU = 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) void HMI_Clear_KEY_UP(void)
{ {
...@@ -360,3 +378,7 @@ void HMI_Clear_KEY_MENU(void) ...@@ -360,3 +378,7 @@ void HMI_Clear_KEY_MENU(void)
{ {
UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU = 0u; UE_CtrlInfo.HMI_KEYInfo.u8KEY_MENU = 0u;
} }
void HMI_Clear_KEY_ODOTRIP(void)
{
UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP = 0u;
}
source/Application/Graphic/UE/DisplaySch_user.h
View file @ 6696766b
...@@ -26,6 +26,7 @@ typedef struct ...@@ -26,6 +26,7 @@ typedef struct
uint8_t u8KEY_CONFIRM; uint8_t u8KEY_CONFIRM;
uint8_t u8KEY_CANCEL; uint8_t u8KEY_CANCEL;
uint8_t u8KEY_MENU; uint8_t u8KEY_MENU;
uint8_t u8KEY_ODOTRIP;
} HMI_KEY_Struct_t; } HMI_KEY_Struct_t;
...@@ -72,23 +73,19 @@ void Display_NothingService(void); ...@@ -72,23 +73,19 @@ void Display_NothingService(void);
void GUI_DisplayServices(void); void GUI_DisplayServices(void);
void HMI_Set_KEY_CtrlRight(uint8_t u8KeyVal);
void HMI_Set_KEY_UP(uint8_t u8KeyVal); void HMI_Set_KEY_UP(uint8_t u8KeyVal);
void HMI_Set_KEY_DOWN(uint8_t u8KeyVal); void HMI_Set_KEY_DOWN(uint8_t u8KeyVal);
void HMI_Set_KEY_LEFT(uint8_t u8KeyVal);
void HMI_Set_KEY_RIGHT(uint8_t u8KeyVal);
void HMI_Set_KEY_CONFIRM(uint8_t u8KeyVal); void HMI_Set_KEY_CONFIRM(uint8_t u8KeyVal);
void HMI_Set_KEY_CANCEL(uint8_t u8KeyVal); void HMI_Set_KEY_CANCEL(uint8_t u8KeyVal);
void HMI_Set_KEY_MENU(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_UP(void);
void HMI_Clear_KEY_DOWN(void); void HMI_Clear_KEY_DOWN(void);
void HMI_Clear_KEY_LEFT(void);
void HMI_Clear_KEY_RIGHT(void);
void HMI_Clear_KEY_CONFIRM(void); void HMI_Clear_KEY_CONFIRM(void);
void HMI_Clear_KEY_CANCEL(void); void HMI_Clear_KEY_CANCEL(void);
void HMI_Clear_KEY_MENU(void); void HMI_Clear_KEY_MENU(void);
void HMI_Clear_KEY_CtrlRight(void); void HMI_Clear_KEY_ODOTRIP(void);
......
source/Driver/Graphic/images.c
View file @ 6696766b
This diff is collapsed.
source/Driver/Graphic/images.h
View file @ 6696766b
...@@ -682,21 +682,6 @@ enum SpriteName ...@@ -682,21 +682,6 @@ enum SpriteName
CN_User_Menu2_01_1black, CN_User_Menu2_01_1black,
CN_User_Menu2_01_1grey, CN_User_Menu2_01_1grey,
CN_User_Menu2_01_1white, CN_User_Menu2_01_1white,
CN_User_Menu2_01_2black,
CN_User_Menu2_01_2grey,
CN_User_Menu2_01_2white,
CN_User_Menu2_01_3black,
CN_User_Menu2_01_3grey,
CN_User_Menu2_01_3white,
CN_User_Menu2_01_4black,
CN_User_Menu2_01_4grey,
CN_User_Menu2_01_4white,
CN_User_Menu2_01_5black,
CN_User_Menu2_01_5grey,
CN_User_Menu2_01_5white,
CN_User_Menu2_01_6black,
CN_User_Menu2_01_6grey,
CN_User_Menu2_01_6white,
CN_User_Menu2_01_wenzi, CN_User_Menu2_01_wenzi,
CN_User_Menu2_02_1black, CN_User_Menu2_02_1black,
CN_User_Menu2_02_1grey, CN_User_Menu2_02_1grey,
...@@ -820,6 +805,9 @@ enum SpriteName ...@@ -820,6 +805,9 @@ enum SpriteName
CN_User_Menu3_00_6black, CN_User_Menu3_00_6black,
CN_User_Menu3_00_6grey, CN_User_Menu3_00_6grey,
CN_User_Menu3_00_6white, CN_User_Menu3_00_6white,
CN_User_Menu3_00_7black,
CN_User_Menu3_00_7grey,
CN_User_Menu3_00_7white,
CN_User_Menu3_00_wenzi, CN_User_Menu3_00_wenzi,
CN_User_Menu3_01_1, CN_User_Menu3_01_1,
CN_User_Menu3_01_10, CN_User_Menu3_01_10,
......
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