Commit 5aa5ef8f authored by hu's avatar hu

调整机油滤清器清空只发送一帧清空请求报文

parent 98c717de
...@@ -1135,6 +1135,21 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -1135,6 +1135,21 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
State_Flag.FState_COilTimeOut = 0u; State_Flag.FState_COilTimeOut = 0u;
} }
else else
{
if (Common_Get_Can_Engine_Oil_Sta() == 1)
{
CopyData[0] = 0x40;
CopyData[1] = 0x20;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
Common_Set_Can_Engine_Oil_Sta(0);
}
else
{ {
/*增加发送5次机制*/ /*增加发送5次机制*/
if (((Common_Get_18EF1718_Msg_Sta() == COMMON_Valid) && (Send_18EF1718_Msg_Sta >= 1u)) || if (((Common_Get_18EF1718_Msg_Sta() == COMMON_Valid) && (Send_18EF1718_Msg_Sta >= 1u)) ||
...@@ -1278,6 +1293,7 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -1278,6 +1293,7 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
break; break;
} }
} }
}
} }
void Id18EF1817_Send_Service(void) void Id18EF1817_Send_Service(void)
......
...@@ -1095,4 +1095,7 @@ EXTERN_MEU_PROCESS void LevelD4_2Menu_6Enter(void); ...@@ -1095,4 +1095,7 @@ EXTERN_MEU_PROCESS void LevelD4_2Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelD4_2Menu_6Do(void); EXTERN_MEU_PROCESS void LevelD4_2Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelD4_2Menu_6Exit(void); EXTERN_MEU_PROCESS void LevelD4_2Menu_6Exit(void);
void Common_Set_Can_Engine_Oil_Sta(uint8_t Vol);
uint8_t Common_Get_Can_Engine_Oil_Sta(void);
#endif #endif
...@@ -19,6 +19,7 @@ uint8_t bCurMenuIDX; ...@@ -19,6 +19,7 @@ uint8_t bCurMenuIDX;
uint8_t bMainMenuIDX; uint8_t bMainMenuIDX;
uint8_t bOldMenuIDX; uint8_t bOldMenuIDX;
uint8_t Menu_DTC_DisTime; uint8_t Menu_DTC_DisTime;
uint8_t Can_Engine_Oil_Sta;
#pragma alignvar(8) #pragma alignvar(8)
_MenuFlag MenuFlag ; _MenuFlag MenuFlag ;
...@@ -2051,7 +2052,12 @@ void Level_Enter_Menu_Exit(void) ...@@ -2051,7 +2052,12 @@ void Level_Enter_Menu_Exit(void)
/*----Return----*/ /*----Return----*/
void Level_Return_Menu_Enter(void) void Level_Return_Menu_Enter(void)
{} {
if (MenuFlag.Menu_Enter_Return == _MN_DSP_LEVEL3_2_MENU_1)
{
Can_Engine_Oil_Sta = 1;
}
}
void Level_Return_Menu_Do(void) void Level_Return_Menu_Do(void)
{ {
GUI_BG_Enter_Return_Display(GUI_DISP_MODE_NORMAL); GUI_BG_Enter_Return_Display(GUI_DISP_MODE_NORMAL);
...@@ -4193,3 +4199,16 @@ void LevelD4_2Menu_6Do(void) ...@@ -4193,3 +4199,16 @@ void LevelD4_2Menu_6Do(void)
} }
void LevelD4_2Menu_6Exit(void) void LevelD4_2Menu_6Exit(void)
{} {}
/*-------------------------------------------------------------*/
void Common_Set_Can_Engine_Oil_Sta(uint8_t Vol)
{
Can_Engine_Oil_Sta = Vol;
}
uint8_t Common_Get_Can_Engine_Oil_Sta(void)
{
return (uint8_t)Can_Engine_Oil_Sta;
}
\ No newline at end of file
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