Skip to content

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

调整演示模式报文外发

parent 305099f8
withBoot_Test Buzzer_Test PopupTest development developmentEn menutest withBoot withBoot_ENCN
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 21 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 44d199ff
......@@ -518,6 +518,8 @@ void Can_Set_Buff_18FF9D17(uint8_t CopyData[])
* Return : None
* onther : Event triggered 事件型报文
--------------------------------------------------------------------------*/
uint8_t LDWS_Flag_Sta = 0u;
void Can_Set_Buff_18FFE517(uint8_t CopyData[])
{
uint8_t DTC_Clear_Request = 0u;
......@@ -530,26 +532,208 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
Ferry_Mode_Cancel = 0u;
System_Demonstration_Request = 0u;
CopyData[0] = (uint8_t)(DTC_Clear_Request & 0xFFu); /* 1 */
CopyData[1] = (uint8_t)(Req_0Point & 0xFFu); /* 2 */
CopyData[2] = (uint8_t)(((Ferry_Mode_Cancel << 7u) & 0x80U) |
(System_Demonstration_Request & 0x7Fu)); /* 3 */
CopyData[3] = 0u; /* 4 */
CopyData[4] = 0u; /* 5 */
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
/*_FAC_DSP_LEVEL1_2MENU_3 _DEA_DSP_LEVEL1_2MENU_3界面发送 两帧 500ms*/
// CopyData[0] = 0x55u; /* 1 */
// CopyData[1] = 0x00u; /* 2 */
// CopyData[2] = 0x00u; /* 3 */
// CopyData[3] = 0xFFu; /* 4 */
// CopyData[4] = 0xFFu; /* 5 */
// CopyData[5] = 0xFFu; /* 6 */
// CopyData[6] = 0xFFu; /* 7 */
// CopyData[7] = 0xFFu; /* 8 */
//CopyData[0] = (uint8_t)(DTC_Clear_Request & 0xFFu); /* 1 */
//CopyData[1] = (uint8_t)(Req_0Point & 0xFFu); /* 2 */
//CopyData[2] = (uint8_t)(((Ferry_Mode_Cancel << 7u) & 0x80U) |
// (System_Demonstration_Request & 0x7Fu)); /* 3 */
//CopyData[3] = 0u; /* 4 */
//CopyData[4] = 0u; /* 5 */
//CopyData[5] = 0u; /* 6 */
//CopyData[6] = 0u; /* 7 */
//CopyData[7] = 0u; /* 8 */
if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1) /*LDWS警报模拟*/
{
if (LDWS_Flag_Sta == 1)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (LDWS_Flag_Sta == 1)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x01u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (LDWS_Flag_Sta == 2)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
}
else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_2) /*AEBS第一警报模拟*/
{
if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (0)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x02u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (0)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
}
else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_3)/*AEBS第二警报模拟*/
{
if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (0)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x03u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (0)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
}
else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_4)/*AEBS本质动警报模拟*/
{
if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (0)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x04u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
else if (0)
{
CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
}
else if ((bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_3) || (bCurMenuIDX == _DEA_DSP_LEVEL1_2MENU_3)) /*DTC清除界面时外发*/
{
/* _FAC_DSP_LEVEL1_2MENU_3 _DEA_DSP_LEVEL1_2MENU_3 界面发送 两帧 500ms */
CopyData[0] = 0x55u; /* 1 */
CopyData[1] = 0x00u; /* 2 */
CopyData[2] = 0x00u; /* 3 */
CopyData[3] = 0xFFu; /* 4 */
CopyData[4] = 0xFFu; /* 5 */
CopyData[5] = 0xFFu; /* 6 */
CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */
}
}
/*事件型外发控制server*/
void Id18FFE517_Send_Service(void)
{
if (K_Line_Set.K_Line_LID27 == 0x01u)
{
if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
{
if (LDWS_Flag_Sta == 0)
{
Can_Msg_Tx_Overwrite(MSGID_18FFE517, 10u, 100 * 1000);
LDWS_Flag_Sta = 1u;
}
else if (LDWS_Flag_Sta == 1)
{
Can_Msg_Tx_Overwrite(MSGID_18FFE517, 30u, 100 * 1000);
LDWS_Flag_Sta = 2u;
}
else if (LDWS_Flag_Sta == 2)
{
Can_Msg_Tx_Overwrite(MSGID_18FFE517, 10u, 100 * 1000);
LDWS_Flag_Sta = 3u;
}
}
}
else if (K_Line_Set.K_Line_LID28 == 0x01u)
{
Can_Msg_Tx_Overwrite(MSGID_18FFE517, 1u, 100 * 1000);
}
else if ((bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_3) || (bCurMenuIDX == _DEA_DSP_LEVEL1_2MENU_3))
{
Can_Msg_Tx_Overwrite(MSGID_18FFE517, 2u, 100 * 1000);
}
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EF2D17
* Description :
......@@ -630,8 +814,8 @@ void Can_Set_Buff_18033317(uint8_t CopyData[])
}
else if (User_set_Num.User_TpmsStatus == 1)
{
CopyData[0] = 0x91; /* 1 */
CopyData[1] = 0u; /* 2 */
CopyData[0] = 0x91; /* 1 */
CopyData[1] = 0u; /* 2 */
}
CopyData[2] = 0u; /* 3 */
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h
View file @ 44d199ff
......@@ -64,6 +64,7 @@ uint8_t Common_GetTXNum_18033317(void);
void Id18EF1817_Send_Service(void);
void Id18033317_Send_Service(void);
void Id18FFE517_Send_Service(void);
void MSG_18021733_REC_COPY(uint8_t copy[]);
......
source/System/tasks.c
View file @ 44d199ff
......@@ -138,6 +138,7 @@ void Sys_Run_Mode_5ms_Tasks(void)
COM_RX_Process();
Id18EF1817_Send_Service();
Id18033317_Send_Service();
Id18FFE517_Send_Service();
}
/*==============================================================================
......
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