Skip to content

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

调整保温外发策略，调整故障码图片

parent ee57e2c6
Show whitespace changes
Inline Side-by-side
Showing with 754 additions and 737 deletions
source/Application/APP/Key/Key_user.c
View file @ 42752533
...@@ -1110,14 +1110,6 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent) ...@@ -1110,14 +1110,6 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent)
{ {
MenuFlag.Key_MenuTest_ShortNum++; MenuFlag.Key_MenuTest_ShortNum++;
} }
/*进入自检模式*/
//if ((MenuFlag.Key_MenuTest_Long == 1u) && (MenuFlag.Key_MenuTest_ShortNum >= 3u))
if (MenuFlag.Key_MenuTest_ShortNum >= 3u)
{
MenuFlag.Menu_Test = 1u;
MenuFlag.Key_MenuTest_ShortNum = 0u;
}
} }
else if (bCurMenuIDX == _MN_DSP_Menu_Test) else if (bCurMenuIDX == _MN_DSP_Menu_Test)
{ {
...@@ -1142,6 +1134,11 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent) ...@@ -1142,6 +1134,11 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent)
{ {
Data_Clear_Trip(EM_TRIP_B); Data_Clear_Trip(EM_TRIP_B);
} }
if (State_Flag.FState_ClearOilTx == 0u)
{
State_Flag.FState_ClearOilTx = 1u;
}
} }
#if 0 #if 0
if (DispVSpeed <= DISPSPEEDNULLMAX) if (DispVSpeed <= DISPSPEEDNULLMAX)
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 42752533
...@@ -670,6 +670,8 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -670,6 +670,8 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{ {
uint8_t Trip_Type = 0u; uint8_t Trip_Type = 0u;
Trip_Type = User_set_Num.Trip_Type ;
if (State_Flag.FState_ClearOilTx == 0x02u) if (State_Flag.FState_ClearOilTx == 0x02u)
{ {
if (Trip_Type == TRAPA) if (Trip_Type == TRAPA)
...@@ -696,17 +698,12 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -696,17 +698,12 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
} }
User_BCM_Flag = 1u; /*从头轮询*/ User_BCM_Flag = 1u; /*从头轮询*/
State_Flag.FState_ClearOilTx = 0x00u; State_Flag.FState_ClearOilTx = 0x03u;
State_Flag.FState_ClearOilRx = 0u; State_Flag.FState_ClearOilRx = 0u;
State_Flag.FState_COilTimeOut = 0u; State_Flag.FState_COilTimeOut = 0u;
} }
else else
{ {
if ((State_Flag.FState_ClearOilRx == 0u) && (State_Flag.FState_COilTimeOut != FState_COilTimeOutNum))
{
return;
}
User_BCM_Flag++; User_BCM_Flag++;
if (User_BCM_Flag > 11u) if (User_BCM_Flag > 11u)
{ {
...@@ -833,11 +830,10 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -833,11 +830,10 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
void Id18EF1817_Send_Service(void) void Id18EF1817_Send_Service(void)
{ {
/*准备事件型*/
if (State_Flag.FState_ClearOilTx == 1u) if (State_Flag.FState_ClearOilTx == 1u)
{ {
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1u, 100 * 1000); Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1u, 100 * 1000);
/*事件型复制*/
State_Flag.FState_ClearOilTx = 2u; State_Flag.FState_ClearOilTx = 2u;
} }
else else
...@@ -849,13 +845,14 @@ void Id18EF1817_Send_Service(void) ...@@ -849,13 +845,14 @@ void Id18EF1817_Send_Service(void)
else else
{ {
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0xFFFFu, 100 * 1000); Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0xFFFFu, 100 * 1000);
State_Flag.FState_ClearOilTx = 0u;
} }
} }
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Drive_Info_IC1_STATUS_Rx * Function Name : Drive_Info_IC1_STATUS_Rx
* Description : 18EF1718 报文循环接收处理 100ms任务中执行 * Description : 18EF1718 报文循环接收处理 50ms任务中执行
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
...@@ -957,24 +954,25 @@ void Drive_Info_IC1_STATUS_Rx(void) ...@@ -957,24 +954,25 @@ void Drive_Info_IC1_STATUS_Rx(void)
break; break;
} }
#if 0
if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum) if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
{ {
State_Flag.FState_COilTimeOut++; State_Flag.FState_COilTimeOut++;
if (State_Flag.FState_COilTimeOut == FState_COilTimeOutNum)
{
State_Flag.FState_ClearOilTx = 0u;
}
} }
if (Data_Sig == 0x40u) if (Data_Sig == 0x40u)
{ {
State_Flag.FState_ClearOilRx == 1; State_Flag.FState_ClearOilRx == 1;
} }
#endif
} }
/*-------------------------------------------------------------------------
* Function Name : Drive_Info_IC3_STATUS_Rx
* Description : 50ms任务中执行
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Drive_Info_IC3_STATUS_Rx(void) void Drive_Info_IC3_STATUS_Rx(void)
{ {
if (bCurMenuIDX != _MN_DSP_LEVEL3_4_MENU_5) if (bCurMenuIDX != _MN_DSP_LEVEL3_4_MENU_5)
...@@ -1051,11 +1049,15 @@ void Drive_Info_IC3_STATUS_Rx(void) ...@@ -1051,11 +1049,15 @@ void Drive_Info_IC3_STATUS_Rx(void)
User_set_Num.User_Tpms ++; User_set_Num.User_Tpms ++;
if (User_set_Num.User_Tpms == 0x0d) if (User_set_Num.User_Tpms == 0x0d)
{
User_set_Num.User_TpmsStatus = 0; User_set_Num.User_TpmsStatus = 0;
}
else else
{
User_set_Num.User_TpmsStatus = 1; User_set_Num.User_TpmsStatus = 1;
} }
} }
}
else if ((Msg_18021733[0] == 0xFF) && (Msg_18021733[1] == 0x06)) else if ((Msg_18021733[0] == 0xFF) && (Msg_18021733[1] == 0x06))
{ {
TPMS_Matching.FLAG = 0; TPMS_Matching.FLAG = 0;
...@@ -1139,6 +1141,7 @@ void Common_SetTXNum_18033317(void) ...@@ -1139,6 +1141,7 @@ void Common_SetTXNum_18033317(void)
{ {
TXNum_18033317 ++; TXNum_18033317 ++;
} }
uint8_t Common_GetTXNum_18033317(void) uint8_t Common_GetTXNum_18033317(void)
{ {
return TXNum_18033317; return TXNum_18033317;
......
source/Application/Graphic/GUI/GUI.c
View file @ 42752533
...@@ -6558,14 +6558,14 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode) ...@@ -6558,14 +6558,14 @@ void GUI_BG_DTCEngine_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_Alarm_Fault_03_image, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_05_wenzi, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, 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_Nb_28_0, 379u, 267u, 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_Nb_28_0, 408u, 267u, 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_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_1, 550u, 305u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 467u, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -6588,14 +6588,14 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode) ...@@ -6588,14 +6588,14 @@ void GUI_BG_DTCSCR_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_Alarm_Fault_03_image, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, 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_Nb_28_0, 379u, 267u, 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_Nb_28_0, 408u, 267u, 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_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_1, 550u, 305u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 467u, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -6618,14 +6618,14 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode) ...@@ -6618,14 +6618,14 @@ void GUI_BG_DTCAMT_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_Alarm_Fault_04_image, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_04_wenzi, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, 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_Nb_28_0, 379u, 267u, 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_Nb_28_0, 408u, 267u, 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_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_RC_Nb_21_1, 550u, 305u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 467u, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
......
source/Application/Graphic/Menu/Menu.h
View file @ 42752533
...@@ -122,25 +122,25 @@ typedef enum ...@@ -122,25 +122,25 @@ typedef enum
_MN_DSP_Menu_Test, /* 81 */ _MN_DSP_Menu_Test, /* 81 */
/*工厂模式*/ /*工厂模式*/
_FAC_DSP_LEVEL1MENU_1, /* 80 DTC显示*/ _FAC_DSP_LEVEL1MENU_1, /* 82 DTC显示*/
_FAC_DSP_LEVEL1MENU_2, /* 81 DTC清除*/ _FAC_DSP_LEVEL1MENU_2, /* 83 DTC清除*/
_FAC_DSP_LEVEL1MENU_3, /* 82 仪表设定显示*/ _FAC_DSP_LEVEL1MENU_3, /* 84 仪表设定显示*/
_FAC_DSP_LEVEL1MENU_4, /* 83 暂时通常模式*/ _FAC_DSP_LEVEL1MENU_4, /* 85 暂时通常模式*/
_FAC_DSP_LEVEL1MENU_5, /* 84 结束工厂模式*/ _FAC_DSP_LEVEL1MENU_5, /* 86 结束工厂模式*/
_FAC_DSP_LEVEL1MENU_6, /* 85 HID自动水平初始化*/ _FAC_DSP_LEVEL1MENU_6, /* 87 HID自动水平初始化*/
_FAC_DSP_LEVEL1_1MENU_1, /* 86 故障码读取中*/ _FAC_DSP_LEVEL1_1MENU_1, /* 88 故障码读取中*/
_FAC_DSP_LEVEL1_2MENU_1, /* 87 清除所有DTC*/ _FAC_DSP_LEVEL1_2MENU_1, /* 89 清除所有DTC*/
_FAC_DSP_LEVEL1_2MENU_2, /* 88 清除所有DTC*/ _FAC_DSP_LEVEL1_2MENU_2, /* 90 清除所有DTC*/
_FAC_DSP_LEVEL1_3MENU_1, /* 89 L0-7 H2-A*/ _FAC_DSP_LEVEL1_3MENU_1, /* 91 L0-7 H2-A*/
_FAC_DSP_LEVEL1_3MENU_2, /* 90 L8-F H2-A*/ _FAC_DSP_LEVEL1_3MENU_2, /* 92 L8-F H2-A*/
_FAC_DSP_LEVEL2_1MENU_1, /* 91 发动机故障*/ _FAC_DSP_LEVEL2_1MENU_1, /* 93 发动机故障*/
_FAC_DSP_LEVEL2_1MENU_2, /* 92 SCR系统故障*/ _FAC_DSP_LEVEL2_1MENU_2, /* 94 SCR系统故障*/
_FAC_DSP_LEVEL2_1MENU_3, /* 93 EBS/ABS故障*/ _FAC_DSP_LEVEL2_1MENU_3, /* 95 EBS/ABS故障*/
_FAC_DSP_LEVEL2_1MENU_4, /* 94 仪表故障*/ _FAC_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/
/*经销商模式*/ /*经销商模式*/
_DIS_DSP_LEVEL1MENU_1, _DIS_DSP_LEVEL1MENU_1,
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 42752533
...@@ -124,25 +124,25 @@ const _MenuOptTab MenuOptTab[] = ...@@ -124,25 +124,25 @@ const _MenuOptTab MenuOptTab[] =
/*81*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelMenuTest_Enter, LevelMenuTest_Do, LevelMenuTest_Exit}, /*81*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelMenuTest_Enter, LevelMenuTest_Do, LevelMenuTest_Exit},
/*工厂模式*/ /*工厂模式*/
/*80*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit}, /*82*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit},
/*81*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit}, /*83*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*82*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit}, /*84*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit},
/*83*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit}, /*85*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit},
/*84*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit}, /*86*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit},
/*85*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit}, /*87*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit},
/*86*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*87*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit}, /*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit}, /*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit}, /*91*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit}, /*92*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*91*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*93*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*92*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit}, /*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*93*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit}, /*95*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit}, /*96*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
}; };
void NextMenu(_MENU_IDX idx) void NextMenu(_MENU_IDX idx)
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 42752533
...@@ -148,8 +148,32 @@ void DisplayServices(void) ...@@ -148,8 +148,32 @@ void DisplayServices(void)
; /*Do Nothing!*/ ; /*Do Nothing!*/
} }
/*通常模式*/
if (MenuFlag.Menu_Popup_Flag == 0u)
{
/*进入自检模式*/
//if ((MenuFlag.Key_MenuTest_Long == 1u) && (MenuFlag.Key_MenuTest_ShortNum >= 3u))
if (MenuFlag.Key_MenuTest_ShortNum >= 3u)
{
MenuFlag.Menu_Test = 1u;
MenuFlag.Key_MenuTest_Long = 0u;
MenuFlag.Key_MenuTest_ShortNum = 0u;
}
else if (0)
{
MenuFlag.Menu_Factory = 1u;
}
else if (0)
{
MenuFlag.Menu_Dealer = 1u;
}
else
{
;/*Do Nothing!*/
}
}
/*工厂模式*/ /*工厂模式*/
if (MenuFlag.Menu_Popup_Flag == 2u) else if (MenuFlag.Menu_Popup_Flag == 2u)
{ {
if (0) if (0)
{ {
...@@ -181,7 +205,7 @@ void DisplayServices(void) ...@@ -181,7 +205,7 @@ void DisplayServices(void)
} }
else if (0) else if (0)
{ {
enuFlag.Menu_Test = 1u; MenuFlag.Menu_Test = 1u;
} }
else else
{ {
...@@ -278,6 +302,7 @@ void DisplayServices(void) ...@@ -278,6 +302,7 @@ void DisplayServices(void)
{ {
; /*do nothing*/ ; /*do nothing*/
} }
/*ODOTrip短*/ /*ODOTrip短*/
if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_SHORT_PRESS) if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_SHORT_PRESS)
{ {
...@@ -288,6 +313,11 @@ void DisplayServices(void) ...@@ -288,6 +313,11 @@ void DisplayServices(void)
{ {
HMI_Clear_KEY_ODOTRIP(); HMI_Clear_KEY_ODOTRIP();
} }
/*ODO off-to-on*/
else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_ODOTRIP == KEY_EVENT_OFF_TO_ON)
{
HMI_Clear_KEY_ODOTRIP();
}
else else
{ {
; /*do nothing*/ ; /*do nothing*/
......
source/Driver/Graphic/images.c
View file @ 42752533
This source diff could not be displayed because it is too large. You can view the blob instead.
source/Driver/Graphic/images.h
View file @ 42752533
...@@ -429,12 +429,6 @@ enum SpriteName ...@@ -429,12 +429,6 @@ enum SpriteName
CN_Alarm_Fault_02_wenzi, CN_Alarm_Fault_02_wenzi,
CN_Alarm_Fault_03_image, CN_Alarm_Fault_03_image,
CN_Alarm_Fault_03_wenzi, CN_Alarm_Fault_03_wenzi,
CN_Alarm_Fault_04_image,
CN_Alarm_Fault_04_wenzi,
CN_Alarm_Fault_05_image,
CN_Alarm_Fault_05_wenzi,
CN_Alarm_Fault_06_image,
CN_Alarm_Fault_06_wenzi,
CN_Alarm_Fault_A, CN_Alarm_Fault_A,
CN_Alarm_Fault_B, CN_Alarm_Fault_B,
CN_Alarm_Fault_C, CN_Alarm_Fault_C,
......
source/System/tasks.c
View file @ 42752533
...@@ -196,6 +196,9 @@ void Sys_Run_Mode_50ms_Tasks(void) ...@@ -196,6 +196,9 @@ void Sys_Run_Mode_50ms_Tasks(void)
Sound_Scheduling_Service(); Sound_Scheduling_Service();
// BGTask(); // BGTask();
IS31_Scan_Refresh(); IS31_Scan_Refresh();
Drive_Info_IC1_STATUS_Rx();
Drive_Info_IC3_STATUS_Rx();
} }
/*============================================================================*/ /*============================================================================*/
...@@ -221,10 +224,6 @@ void Sys_Run_Mode_100ms_Tasks(void) ...@@ -221,10 +224,6 @@ void Sys_Run_Mode_100ms_Tasks(void)
Popups_Management_Service(); Popups_Management_Service();
Popup_Scheduling_Service(); Popup_Scheduling_Service();
/*CAN 数据处理*/
Drive_Info_IC1_STATUS_Rx();
Drive_Info_IC3_STATUS_Rx();
/*保养通知数据计算*/ /*保养通知数据计算*/
Common_EOL_User_Server(); Common_EOL_User_Server();
/*加速度计算*/ /*加速度计算*/
......
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