调整报文外发

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -14,7 +14,7 @@ const st_CAN_SendAttribute    st_CANSendAttr[ID_SEND_TOTAL] =
     {0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u, MSG_EXT,  9u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF2517, (void *)0},
     {0x18FF2A17ul, 2000ul * 1000ul, 19ul, 0u, MSG_EXT, 10u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF2A17, (void *)0},
     {0x18FF9D17ul,  100ul * 1000ul, 23ul, 0u, MSG_EXT, 11u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF9D17, (void *)0},
-    {0x18FFE517ul,    0ul * 1000ul, 29ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, (void *)0},
+    {0x18FFE517ul,    0ul * 1000ul, 29ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, Common_SetId18FFE517Msg_TXSUCCESS},
     //{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18EF2D17, (void *)0},
     {0x18033317ul,    0ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18033317, (void *)0},
     {0x180433A2ul,  100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_180433A2, (void *)0},

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -27,9 +27,9 @@ uint8_t TpmsMsg18033317SendFlag = 0;
 uint8_t Msg_18021733[8];
 static uint8_t TXNum_18033317;
 
-
 uint32_t DisDTCNumber[50];
 uint8_t  DisDTCNum;
+uint8_t Id18FFE517Msg_TXSUCCESSNum;
 
 /*---------------------------------------------------------------------------
 使用しない Byte、bit に関しては全て 1(B)をセットして出力すること
@@ -544,7 +544,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
 
     if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1) /*LDWS警报模拟*/
     {
-        if (LDWS_Flag_Sta == 1)
+        if (Common_Get_LDWS_Flag_Sta() == 1)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -555,7 +555,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (LDWS_Flag_Sta == 1)
+        else if (Common_Get_LDWS_Flag_Sta() == 3)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -566,7 +566,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (LDWS_Flag_Sta == 2)
+        else if (Common_Get_LDWS_Flag_Sta() == 5)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -580,7 +580,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
     }
     else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_2) /*AEBS第一警报模拟*/
     {
-        if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
+        if (Common_Get_LDWS_Flag_Sta() == 1)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -591,7 +591,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (0)
+        else if (Common_Get_LDWS_Flag_Sta() == 3)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -602,7 +602,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (0)
+        else if (Common_Get_LDWS_Flag_Sta() == 5)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -616,7 +616,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
     }
     else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_3)/*AEBS第二警报模拟*/
     {
-        if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
+        if (Common_Get_LDWS_Flag_Sta() == 1)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -627,7 +627,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (0)
+        else if (Common_Get_LDWS_Flag_Sta() == 3)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -638,7 +638,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (0)
+        else if (Common_Get_LDWS_Flag_Sta() == 5)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -652,7 +652,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
     }
     else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_4)/*AEBS本质动警报模拟*/
     {
-        if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
+        if (Common_Get_LDWS_Flag_Sta() == 1)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -663,7 +663,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (0)
+        else if (Common_Get_LDWS_Flag_Sta() == 3)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -674,7 +674,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
             CopyData[6] = 0xFFu; /* 7  */
             CopyData[7] = 0xFFu; /* 8  */
         }
-        else if (0)
+        else if (Common_Get_LDWS_Flag_Sta() == 5)
         {
             CopyData[0] = 0x00u; /* 1  */
             CopyData[1] = 0x00u; /* 2  */
@@ -703,37 +703,74 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
 /*事件型外发控制server*/
 void Id18FFE517_Send_Service(void)
 {
-    if (K_Line_Set.K_Line_LID27 == 0x01u)
+    if ((bCurMenuIDX >= _MN_DSP_LEVEL3_5_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_5_MENU_4))
     {
-        if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1)
+        if (Common_Get_LDWS_Flag_Sta() == 0u)
+        {
+            Id18FFE517Msg_TXSUCCESSNum = 0u;
+            Can_Msg_Tx_Overwrite(MSGID_18FFE517, 10u, 100 * 1000);
+            Common_Set_LDWS_Flag_Sta(1u);
+        }
+        else if (Common_Get_LDWS_Flag_Sta() == 1u)
         {
-            if (LDWS_Flag_Sta == 0)
+            if (Common_GetId18FFE517Msg_TXSUCCESS() == 10)
             {
-                Can_Msg_Tx_Overwrite(MSGID_18FFE517, 10u, 100 * 1000);
-                LDWS_Flag_Sta = 1u;
+                Id18FFE517Msg_TXSUCCESSNum = 0u;
+                Common_Set_LDWS_Flag_Sta(2);
             }
-            else if (LDWS_Flag_Sta == 1)
+        }
+        else if (Common_Get_LDWS_Flag_Sta() == 2u)
+        {
+            Can_Msg_Tx_Overwrite(MSGID_18FFE517, 30u, 100 * 1000);
+            Common_Set_LDWS_Flag_Sta(3u);
+        }
+        else if (Common_Get_LDWS_Flag_Sta() == 3u)
+        {
+            if (Common_GetId18FFE517Msg_TXSUCCESS() == 30)
             {
-                Can_Msg_Tx_Overwrite(MSGID_18FFE517, 30u, 100 * 1000);
-                LDWS_Flag_Sta = 2u;
+                Id18FFE517Msg_TXSUCCESSNum = 0u;
+                Common_Set_LDWS_Flag_Sta(4);
             }
-            else if (LDWS_Flag_Sta == 2)
+        }
+        else if (Common_Get_LDWS_Flag_Sta() == 4u)
+        {
+            Can_Msg_Tx_Overwrite(MSGID_18FFE517, 10u, 100 * 1000);
+            Common_Set_LDWS_Flag_Sta(5u);
+        }
+        else if (Common_Get_LDWS_Flag_Sta() == 5u)
+        {
+            if (Common_GetId18FFE517Msg_TXSUCCESS() == 10)
             {
-                Can_Msg_Tx_Overwrite(MSGID_18FFE517, 10u, 100 * 1000);
-                LDWS_Flag_Sta  = 3u;
+                Id18FFE517Msg_TXSUCCESSNum = 0u;
+                Common_Set_LDWS_Flag_Sta(6);
             }
         }
     }
-    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);
+        Can_Msg_Tx_Overwrite(MSGID_18FFE517, 2u, 500 * 1000);
     }
 }
 
+void Common_SetId18FFE517Msg_TXSUCCESS(void)
+{
+    Id18FFE517Msg_TXSUCCESSNum++;
+}
+
+uint8_t Common_GetId18FFE517Msg_TXSUCCESS(void)
+{
+    return Id18FFE517Msg_TXSUCCESSNum;
+}
+
+void Common_Set_LDWS_Flag_Sta(uint8_t Vol)
+{
+    LDWS_Flag_Sta = Vol;
+}
+
+uint8_t Common_Get_LDWS_Flag_Sta(void)
+{
+    return LDWS_Flag_Sta;
+}
 /*-------------------------------------------------------------------------
  * Function Name  : Can_Set_Buff_18EF2D17
  * Description    :

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h

@@ -67,6 +67,10 @@ void Id18033317_Send_Service(void);
 void Id18FFE517_Send_Service(void);
 
 void MSG_18021733_REC_COPY(uint8_t copy[]);
+void Common_SetId18FFE517Msg_TXSUCCESS(void);
+uint8_t Common_GetId18FFE517Msg_TXSUCCESS(void);
+void Common_Set_LDWS_Flag_Sta(uint8_t Vol);
+uint8_t Common_Get_LDWS_Flag_Sta(void);
 
 
 void Common_DTC_Server(void);

source/Application/Graphic/Menu/Menu_user.c

@@ -866,6 +866,11 @@ void Level2_5Menu_1Do(void)
     GUI_OftenShow_Display();
     GUI_BG_Demo_Menu_Display(GUI_DISP_MODE_NORMAL);
     GUI_BG_DemoMenu1_Display(GUI_DISP_MODE_NORMAL);
+
+    if (Common_Get_LDWS_Flag_Sta() == 6u)
+    {
+        NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
+    }
 }
 void Level2_5Menu_1Exit(void)
 {}
@@ -873,7 +878,9 @@ void Level2_5Menu_1Exit(void)
 /*----二级菜单----系统演示----系列子菜单*/
 /*AEBS第1警报演示*/
 void Level2_5Menu_2Enter(void)
-{}
+{
+    Common_Set_LDWS_Flag_Sta(0u);
+}
 void Level2_5Menu_2Do(void)
 {
     GUI_OftenShow_Display();
@@ -1578,7 +1585,9 @@ void Level3_4Menu_7Exit_2(void)
 /*----三级菜单----系统演示----系列子菜单*/
 /*LDWS 警报演示*/
 void Level3_5Menu_1Enter(void)
-{}
+{
+    Common_Set_LDWS_Flag_Sta(0u);
+}
 void Level3_5Menu_1Do(void)
 {
     GUI_OftenShow_Display(); /*1238*/
@@ -1586,6 +1595,12 @@ void Level3_5Menu_1Do(void)
     GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_NORMAL);/*5*/
     Gui_DrivingSupport_Display(GUI_DISP_MODE_NORMAL);/*6*/
     Gui_Gear_Display(GUI_DISP_MODE_NORMAL);/*7*/
+
+    if (Common_Get_LDWS_Flag_Sta() == 6u)
+    {
+        NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
+        Common_Set_LDWS_Flag_Sta(0u);
+    }
 }
 void Level3_5Menu_1Exit(void)
 {}
@@ -1593,12 +1608,20 @@ void Level3_5Menu_1Exit(void)
 /*----三级菜单----系统演示----系列子菜单*/
 /*AEBS第1警报演示*/
 void Level3_5Menu_2Enter(void)
-{}
+{
+    Common_Set_LDWS_Flag_Sta(0u);
+}
 void Level3_5Menu_2Do(void)
 {
     GUI_OftenShow_Display();
     GUI_Dynamic_DIsplay();
     GUI_AEBS_Test1_Display(GUI_DISP_MODE_NORMAL);
+
+    if (Common_Get_LDWS_Flag_Sta() == 6u)
+    {
+        NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
+        Common_Set_LDWS_Flag_Sta(0u);
+    }
 }
 void Level3_5Menu_2Exit(void)
 {}
@@ -1606,12 +1629,20 @@ void Level3_5Menu_2Exit(void)
 /*----三级菜单----系统演示----系列子菜单*/
 /*AEBS第2警报演示*/
 void Level3_5Menu_3Enter(void)
-{}
+{
+    Common_Set_LDWS_Flag_Sta(0u);
+}
 void Level3_5Menu_3Do(void)
 {
     GUI_OftenShow_Display();
     GUI_Dynamic_DIsplay();
     GUI_AEBS_Test2_Display(GUI_DISP_MODE_NORMAL);
+
+    if (Common_Get_LDWS_Flag_Sta() == 6u)
+    {
+        NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
+        Common_Set_LDWS_Flag_Sta(0u);
+    }
 }
 void Level3_5Menu_3Exit(void)
 {}
@@ -1619,12 +1650,20 @@ void Level3_5Menu_3Exit(void)
 /*----三级菜单----系统演示----系列子菜单*/
 /*AEBS全力制动警报演示*/
 void Level3_5Menu_4Enter(void)
-{}
+{
+    Common_Set_LDWS_Flag_Sta(0u);
+}
 void Level3_5Menu_4Do(void)
 {
     GUI_OftenShow_Display();
     GUI_Dynamic_DIsplay();
     GUI_AEBS_Test3_Display(GUI_DISP_MODE_NORMAL);
+
+    if (Common_Get_LDWS_Flag_Sta() == 6u)
+    {
+        NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
+        Common_Set_LDWS_Flag_Sta(0u);
+    }
 }
 void Level3_5Menu_4Exit(void)
 {}

source/Application/RTE/RTE_CAN.c

@@ -42,7 +42,7 @@ void Can_Init(void)
     CANLLCCh0Filter.stRSCANCh0.u32RSCANChEn = 1u;       /*通道是否使能*/
     CANLLCCh0Filter.stRSCANCh0.enRSCANChBps = RSCAN_Baud_Rate_500K;       /*通道波特率*/
     CANLLCCh0Filter.stRSCANCh0.u32RSCANChRuleSize = CANFD0_CH0_RX_RULE_SIZE; /*通道接收规则条数*/
-    CANLLCCh0Filter.stRSCANCh0.pfnRSCANConfirmCallBack = 0u;  /*发送确认*/
+    CANLLCCh0Filter.stRSCANCh0.pfnRSCANConfirmCallBack = Can_Confirm;  /*发送确认*/
     CANLLCCh0Filter.stRSCANCh0.pfnRSCANAbortConfirmCallBack = 0u; /*发送中止确认*/
     CANLLCCh0Filter.stRSCANCh0.pfnRSCANReadMsgCallBack = Can_Read_Msg; /*接收完成*/
 
@@ -159,6 +159,39 @@ void Can_Read_Msg2(uint32_t m_id, uint8_t m_dlc, uint8_t m_Msg[])
 
 void Can_Confirm(uint32_t Identifier, uint8_t TransferStatus)
 {
+    switch (Identifier)
+    {
+    case RSCAN_CHANNEL_BUF_0:
+        break;
+    case RSCAN_CHANNEL_BUF_1:
+        break;
+    case RSCAN_CHANNEL_BUF_2:
+        break;
+    case RSCAN_CHANNEL_BUF_3:
+        break;
+    case RSCAN_CHANNEL_BUF_4:
+        break;
+    case RSCAN_CHANNEL_BUF_5:
+        break;
+    case RSCAN_CHANNEL_BUF_6:
+        break;
+    case RSCAN_CHANNEL_BUF_7:
+        break;
+    case RSCAN_CHANNEL_BUF_8:
+        break;
+    case RSCAN_CHANNEL_BUF_9:
+        break;
+    case RSCAN_CHANNEL_BUF_10:
+        break;
+    case RSCAN_CHANNEL_BUF_11:
+        break;
+    case RSCAN_CHANNEL_BUF_12:  Can_Msg_TX_SUCCESS(MSGID_18FFE517);
+        break;
+    case RSCAN_CHANNEL_BUF_13:
+        break;
+    default :
+        break;
+    }
 }
 
 

source/Driver/CAN/Rscan.h

@@ -22,7 +22,7 @@ typedef enum
     RSCAN_CHANNEL_BUF_11,
     RSCAN_CHANNEL_BUF_12,
     RSCAN_CHANNEL_BUF_13,
-
+   
     RSCAN_CHANNEL_BUF_MAX,
 
 } RSCAN_Channel_Buf_en_t;