Skip to content

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

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

parent 98c717de
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 135 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 5aa5ef8f
......@@ -1136,146 +1136,162 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
}
else
{
/*增加发送5次机制*/
if (((Common_Get_18EF1718_Msg_Sta() == COMMON_Valid) && (Send_18EF1718_Msg_Sta >= 1u)) ||
(Send_18EF1718_Msg_Sta >= 6u))
if (Common_Get_Can_Engine_Oil_Sta() == 1)
{
User_BCM_Flag++;
if (User_BCM_Flag > 12u)
{
User_BCM_Flag = 1u;
}
}
else
{
if (Send_18EF1718_Msg_Sta <= 10)
Send_18EF1718_Msg_Sta++;
}
switch (User_BCM_Flag)
{
case 1:
CopyData[0] = 0x01;
CopyData[1] = 0x50;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 2:
CopyData[0] = 0x01;
CopyData[1] = 0x51;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 3:
CopyData[0] = 0x01;
CopyData[1] = 0x52;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 4:
CopyData[0] = 0x01;
CopyData[1] = 0x53;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 5:
CopyData[0] = 0x01;
CopyData[1] = 0x54;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 6:
CopyData[0] = 0x01;
CopyData[1] = 0x60;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 7:
CopyData[0] = 0x01;
CopyData[1] = 0x61;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 8:
CopyData[0] = 0x01;
CopyData[1] = 0x62;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 9:
CopyData[0] = 0x01;
CopyData[1] = 0x63;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 10:
CopyData[0] = 0x01;
CopyData[1] = 0x64;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 11:
CopyData[0] = 0x01;
CopyData[1] = 0x22;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 12:
CopyData[0] = 0x01;
CopyData[1] = 0x30;
CopyData[0] = 0x40;
CopyData[1] = 0x20;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
default:
break;
Common_Set_Can_Engine_Oil_Sta(0);
}
else
{
/*增加发送5次机制*/
if (((Common_Get_18EF1718_Msg_Sta() == COMMON_Valid) && (Send_18EF1718_Msg_Sta >= 1u)) ||
(Send_18EF1718_Msg_Sta >= 6u))
{
User_BCM_Flag++;
if (User_BCM_Flag > 12u)
{
User_BCM_Flag = 1u;
}
}
else
{
if (Send_18EF1718_Msg_Sta <= 10)
Send_18EF1718_Msg_Sta++;
}
switch (User_BCM_Flag)
{
case 1:
CopyData[0] = 0x01;
CopyData[1] = 0x50;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 2:
CopyData[0] = 0x01;
CopyData[1] = 0x51;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 3:
CopyData[0] = 0x01;
CopyData[1] = 0x52;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 4:
CopyData[0] = 0x01;
CopyData[1] = 0x53;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 5:
CopyData[0] = 0x01;
CopyData[1] = 0x54;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 6:
CopyData[0] = 0x01;
CopyData[1] = 0x60;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 7:
CopyData[0] = 0x01;
CopyData[1] = 0x61;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 8:
CopyData[0] = 0x01;
CopyData[1] = 0x62;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 9:
CopyData[0] = 0x01;
CopyData[1] = 0x63;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 10:
CopyData[0] = 0x01;
CopyData[1] = 0x64;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 11:
CopyData[0] = 0x01;
CopyData[1] = 0x22;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
case 12:
CopyData[0] = 0x01;
CopyData[1] = 0x30;
CopyData[2] = 0x00;
CopyData[3] = 0x00;
CopyData[4] = 0x00;
CopyData[5] = 0x00;
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
break;
default:
break;
}
}
}
}
......
source/Application/Graphic/Menu/Menu.h
View file @ 5aa5ef8f
......@@ -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_6Exit(void);
void Common_Set_Can_Engine_Oil_Sta(uint8_t Vol);
uint8_t Common_Get_Can_Engine_Oil_Sta(void);
#endif
source/Application/Graphic/Menu/Menu_user.c
View file @ 5aa5ef8f
......@@ -19,6 +19,7 @@ uint8_t bCurMenuIDX;
uint8_t bMainMenuIDX;
uint8_t bOldMenuIDX;
uint8_t Menu_DTC_DisTime;
uint8_t Can_Engine_Oil_Sta;
#pragma alignvar(8)
_MenuFlag MenuFlag ;
......@@ -2051,7 +2052,12 @@ void Level_Enter_Menu_Exit(void)
/*----Return----*/
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)
{
GUI_BG_Enter_Return_Display(GUI_DISP_MODE_NORMAL);
......@@ -4192,4 +4198,17 @@ void LevelD4_2Menu_6Do(void)
GUI_BG_DeaDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD4_2Menu_6Exit(void)
{}
\ No newline at end of file
{}
/*-------------------------------------------------------------*/
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