Skip to content

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

调整报文外发

parent 44d199ff
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 165 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 2da17dab
...@@ -14,7 +14,7 @@ const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] = ...@@ -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}, {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}, {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}, {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}, //{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}, {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}, {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
View file @ 2da17dab
...@@ -27,9 +27,9 @@ uint8_t TpmsMsg18033317SendFlag = 0; ...@@ -27,9 +27,9 @@ uint8_t TpmsMsg18033317SendFlag = 0;
uint8_t Msg_18021733[8]; uint8_t Msg_18021733[8];
static uint8_t TXNum_18033317; static uint8_t TXNum_18033317;
uint32_t DisDTCNumber[50]; uint32_t DisDTCNumber[50];
uint8_t DisDTCNum; uint8_t DisDTCNum;
uint8_t Id18FFE517Msg_TXSUCCESSNum;
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
使用しない Byte、bit に関しては全て 1(B)をセットして出力すること 使用しない Byte、bit に関しては全て 1(B)をセットして出力すること
...@@ -544,7 +544,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -544,7 +544,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_1) /*LDWS警报模拟*/ 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[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -555,7 +555,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -555,7 +555,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (LDWS_Flag_Sta == 1) else if (Common_Get_LDWS_Flag_Sta() == 3)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -566,7 +566,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -566,7 +566,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (LDWS_Flag_Sta == 2) else if (Common_Get_LDWS_Flag_Sta() == 5)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -580,7 +580,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -580,7 +580,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_2) /*AEBS第一警报模拟*/ 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[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -591,7 +591,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -591,7 +591,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (0) else if (Common_Get_LDWS_Flag_Sta() == 3)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -602,7 +602,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -602,7 +602,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (0) else if (Common_Get_LDWS_Flag_Sta() == 5)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -616,7 +616,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -616,7 +616,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_3)/*AEBS第二警报模拟*/ 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[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -627,7 +627,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -627,7 +627,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (0) else if (Common_Get_LDWS_Flag_Sta() == 3)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -638,7 +638,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -638,7 +638,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (0) else if (Common_Get_LDWS_Flag_Sta() == 5)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -652,7 +652,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -652,7 +652,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_5_MENU_4)/*AEBS本质动警报模拟*/ 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[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -663,7 +663,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -663,7 +663,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (0) else if (Common_Get_LDWS_Flag_Sta() == 3)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -674,7 +674,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -674,7 +674,7 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[6] = 0xFFu; /* 7 */ CopyData[6] = 0xFFu; /* 7 */
CopyData[7] = 0xFFu; /* 8 */ CopyData[7] = 0xFFu; /* 8 */
} }
else if (0) else if (Common_Get_LDWS_Flag_Sta() == 5)
{ {
CopyData[0] = 0x00u; /* 1 */ CopyData[0] = 0x00u; /* 1 */
CopyData[1] = 0x00u; /* 2 */ CopyData[1] = 0x00u; /* 2 */
...@@ -703,37 +703,74 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[]) ...@@ -703,37 +703,74 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
/*事件型外发控制server*/ /*事件型外发控制server*/
void Id18FFE517_Send_Service(void) 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); Id18FFE517Msg_TXSUCCESSNum = 0u;
LDWS_Flag_Sta = 1u; 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); Id18FFE517Msg_TXSUCCESSNum = 0u;
LDWS_Flag_Sta = 2u; 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); Id18FFE517Msg_TXSUCCESSNum = 0u;
LDWS_Flag_Sta = 3u; 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)) 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 * Function Name : Can_Set_Buff_18EF2D17
* Description : * Description :
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h
View file @ 2da17dab
...@@ -67,6 +67,10 @@ void Id18033317_Send_Service(void); ...@@ -67,6 +67,10 @@ void Id18033317_Send_Service(void);
void Id18FFE517_Send_Service(void); void Id18FFE517_Send_Service(void);
void MSG_18021733_REC_COPY(uint8_t copy[]); 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); void Common_DTC_Server(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 2da17dab
...@@ -866,6 +866,11 @@ void Level2_5Menu_1Do(void) ...@@ -866,6 +866,11 @@ void Level2_5Menu_1Do(void)
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_Demo_Menu_Display(GUI_DISP_MODE_NORMAL); GUI_BG_Demo_Menu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DemoMenu1_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) void Level2_5Menu_1Exit(void)
{} {}
...@@ -873,7 +878,9 @@ void Level2_5Menu_1Exit(void) ...@@ -873,7 +878,9 @@ void Level2_5Menu_1Exit(void)
/*----二级菜单----系统演示----系列子菜单*/ /*----二级菜单----系统演示----系列子菜单*/
/*AEBS第1警报演示*/ /*AEBS第1警报演示*/
void Level2_5Menu_2Enter(void) void Level2_5Menu_2Enter(void)
{} {
Common_Set_LDWS_Flag_Sta(0u);
}
void Level2_5Menu_2Do(void) void Level2_5Menu_2Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
...@@ -1578,7 +1585,9 @@ void Level3_4Menu_7Exit_2(void) ...@@ -1578,7 +1585,9 @@ void Level3_4Menu_7Exit_2(void)
/*----三级菜单----系统演示----系列子菜单*/ /*----三级菜单----系统演示----系列子菜单*/
/*LDWS 警报演示*/ /*LDWS 警报演示*/
void Level3_5Menu_1Enter(void) void Level3_5Menu_1Enter(void)
{} {
Common_Set_LDWS_Flag_Sta(0u);
}
void Level3_5Menu_1Do(void) void Level3_5Menu_1Do(void)
{ {
GUI_OftenShow_Display(); /*1238*/ GUI_OftenShow_Display(); /*1238*/
...@@ -1586,6 +1595,12 @@ void Level3_5Menu_1Do(void) ...@@ -1586,6 +1595,12 @@ void Level3_5Menu_1Do(void)
GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_NORMAL);/*5*/ GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_NORMAL);/*5*/
Gui_DrivingSupport_Display(GUI_DISP_MODE_NORMAL);/*6*/ Gui_DrivingSupport_Display(GUI_DISP_MODE_NORMAL);/*6*/
Gui_Gear_Display(GUI_DISP_MODE_NORMAL);/*7*/ 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) void Level3_5Menu_1Exit(void)
{} {}
...@@ -1593,12 +1608,20 @@ void Level3_5Menu_1Exit(void) ...@@ -1593,12 +1608,20 @@ void Level3_5Menu_1Exit(void)
/*----三级菜单----系统演示----系列子菜单*/ /*----三级菜单----系统演示----系列子菜单*/
/*AEBS第1警报演示*/ /*AEBS第1警报演示*/
void Level3_5Menu_2Enter(void) void Level3_5Menu_2Enter(void)
{} {
Common_Set_LDWS_Flag_Sta(0u);
}
void Level3_5Menu_2Do(void) void Level3_5Menu_2Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_Dynamic_DIsplay(); GUI_Dynamic_DIsplay();
GUI_AEBS_Test1_Display(GUI_DISP_MODE_NORMAL); 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) void Level3_5Menu_2Exit(void)
{} {}
...@@ -1606,12 +1629,20 @@ void Level3_5Menu_2Exit(void) ...@@ -1606,12 +1629,20 @@ void Level3_5Menu_2Exit(void)
/*----三级菜单----系统演示----系列子菜单*/ /*----三级菜单----系统演示----系列子菜单*/
/*AEBS第2警报演示*/ /*AEBS第2警报演示*/
void Level3_5Menu_3Enter(void) void Level3_5Menu_3Enter(void)
{} {
Common_Set_LDWS_Flag_Sta(0u);
}
void Level3_5Menu_3Do(void) void Level3_5Menu_3Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_Dynamic_DIsplay(); GUI_Dynamic_DIsplay();
GUI_AEBS_Test2_Display(GUI_DISP_MODE_NORMAL); 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) void Level3_5Menu_3Exit(void)
{} {}
...@@ -1619,12 +1650,20 @@ void Level3_5Menu_3Exit(void) ...@@ -1619,12 +1650,20 @@ void Level3_5Menu_3Exit(void)
/*----三级菜单----系统演示----系列子菜单*/ /*----三级菜单----系统演示----系列子菜单*/
/*AEBS全力制动警报演示*/ /*AEBS全力制动警报演示*/
void Level3_5Menu_4Enter(void) void Level3_5Menu_4Enter(void)
{} {
Common_Set_LDWS_Flag_Sta(0u);
}
void Level3_5Menu_4Do(void) void Level3_5Menu_4Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_Dynamic_DIsplay(); GUI_Dynamic_DIsplay();
GUI_AEBS_Test3_Display(GUI_DISP_MODE_NORMAL); 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) void Level3_5Menu_4Exit(void)
{} {}
......
source/Application/RTE/RTE_CAN.c
View file @ 2da17dab
...@@ -42,7 +42,7 @@ void Can_Init(void) ...@@ -42,7 +42,7 @@ void Can_Init(void)
CANLLCCh0Filter.stRSCANCh0.u32RSCANChEn = 1u; /*通道是否使能*/ CANLLCCh0Filter.stRSCANCh0.u32RSCANChEn = 1u; /*通道是否使能*/
CANLLCCh0Filter.stRSCANCh0.enRSCANChBps = RSCAN_Baud_Rate_500K; /*通道波特率*/ CANLLCCh0Filter.stRSCANCh0.enRSCANChBps = RSCAN_Baud_Rate_500K; /*通道波特率*/
CANLLCCh0Filter.stRSCANCh0.u32RSCANChRuleSize = CANFD0_CH0_RX_RULE_SIZE; /*通道接收规则条数*/ CANLLCCh0Filter.stRSCANCh0.u32RSCANChRuleSize = CANFD0_CH0_RX_RULE_SIZE; /*通道接收规则条数*/
CANLLCCh0Filter.stRSCANCh0.pfnRSCANConfirmCallBack = 0u; /*发送确认*/ CANLLCCh0Filter.stRSCANCh0.pfnRSCANConfirmCallBack = Can_Confirm; /*发送确认*/
CANLLCCh0Filter.stRSCANCh0.pfnRSCANAbortConfirmCallBack = 0u; /*发送中止确认*/ CANLLCCh0Filter.stRSCANCh0.pfnRSCANAbortConfirmCallBack = 0u; /*发送中止确认*/
CANLLCCh0Filter.stRSCANCh0.pfnRSCANReadMsgCallBack = Can_Read_Msg; /*接收完成*/ 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[]) ...@@ -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) 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.c
View file @ 2da17dab
...@@ -1478,257 +1478,257 @@ void RSCAN0_CH1_TX_ISR(void) ...@@ -1478,257 +1478,257 @@ void RSCAN0_CH1_TX_ISR(void)
if ((RSCAN0TMSTS16 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS16 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS16 = 0X0U; RSCAN0TMSTS16 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(16, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(0, 0);
} }
} }
else if ((RSCAN0TMSTS16 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS16 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS16 = 0X0U; RSCAN0TMSTS16 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(16U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(0U);
} }
} }
if ((RSCAN0TMSTS17 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS17 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS17 = 0X0U; RSCAN0TMSTS17 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(17, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(1, 0);
} }
} }
else if ((RSCAN0TMSTS17 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS17 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS17 = 0X0U; RSCAN0TMSTS17 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(17U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(1U);
} }
} }
if ((RSCAN0TMSTS18 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS18 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS18 = 0X0U; RSCAN0TMSTS18 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(18, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(2, 0);
} }
} }
else if ((RSCAN0TMSTS18 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS18 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS18 = 0X0U; RSCAN0TMSTS18 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(18U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(2U);
} }
} }
if ((RSCAN0TMSTS19 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS19 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS19 = 0X0U; RSCAN0TMSTS19 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(19, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(3, 0);
} }
} }
else if ((RSCAN0TMSTS19 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS19 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS19 = 0X0U; RSCAN0TMSTS19 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(19U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(3U);
} }
} }
if ((RSCAN0TMSTS20 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS20 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS20 = 0X0U; RSCAN0TMSTS20 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(20, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(4, 0);
} }
} }
else if ((RSCAN0TMSTS20 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS20 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS20 = 0X0U; RSCAN0TMSTS20 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(20U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(4U);
} }
} }
if ((RSCAN0TMSTS21 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS21 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS21 = 0X0U; RSCAN0TMSTS21 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(21, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(5, 0);
} }
} }
else if ((RSCAN0TMSTS21 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS21 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS21 = 0X0U; RSCAN0TMSTS21 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(21U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(5U);
} }
} }
if ((RSCAN0TMSTS22 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS22 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS22 = 0X0U; RSCAN0TMSTS22 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(22, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(6, 0);
} }
} }
else if ((RSCAN0TMSTS22 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS22 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS22 = 0X0U; RSCAN0TMSTS22 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(22U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(6U);
} }
} }
if ((RSCAN0TMSTS23 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS23 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS23 = 0X0U; RSCAN0TMSTS23 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(23, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(7, 0);
} }
} }
else if ((RSCAN0TMSTS23 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS23 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS23 = 0X0U; RSCAN0TMSTS23 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(23U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(7U);
} }
} }
if ((RSCAN0TMSTS24 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS24 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS24 = 0X0U; RSCAN0TMSTS24 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(24, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(8, 0);
} }
} }
else if ((RSCAN0TMSTS24 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS24 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS24 = 0X0U; RSCAN0TMSTS24 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(24U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(8U);
} }
} }
if ((RSCAN0TMSTS25 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS25 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS25 = 0X0U; RSCAN0TMSTS25 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(25, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(9, 0);
} }
} }
else if ((RSCAN0TMSTS25 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS25 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS25 = 0X0U; RSCAN0TMSTS25 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(25U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(9U);
} }
} }
if ((RSCAN0TMSTS26 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS26 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS26 = 0X0U; RSCAN0TMSTS26 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(26, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(10, 0);
} }
} }
else if ((RSCAN0TMSTS26 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS26 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS26 = 0X0U; RSCAN0TMSTS26 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(26U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(10U);
} }
} }
if ((RSCAN0TMSTS27 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS27 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS27 = 0X0U; RSCAN0TMSTS27 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(27, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(11, 0);
} }
} }
else if ((RSCAN0TMSTS27 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS27 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS27 = 0X0U; RSCAN0TMSTS27 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(27U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(11U);
} }
} }
if ((RSCAN0TMSTS28 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS28 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS28 = 0X0U; RSCAN0TMSTS28 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(28, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(12, 0);
} }
} }
else if ((RSCAN0TMSTS28 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS28 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS28 = 0X0U; RSCAN0TMSTS28 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(28U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(12U);
} }
} }
if ((RSCAN0TMSTS29 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS29 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS29 = 0X0U; RSCAN0TMSTS29 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(29, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(13, 0);
} }
} }
else if ((RSCAN0TMSTS29 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS29 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS29 = 0X0U; RSCAN0TMSTS29 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(29U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(13U);
} }
} }
if ((RSCAN0TMSTS30 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS30 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS30 = 0X0U; RSCAN0TMSTS30 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(30, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(14, 0);
} }
} }
else if ((RSCAN0TMSTS30 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS30 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS30 = 0X0U; RSCAN0TMSTS30 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(30U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(14U);
} }
} }
if ((RSCAN0TMSTS31 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS31 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS31 = 0X0U; RSCAN0TMSTS31 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANConfirmCallBack(31, 0); g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(15, 0);
} }
} }
else if ((RSCAN0TMSTS31 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS31 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS31 = 0X0U; RSCAN0TMSTS31 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh0.pfnRSCANAbortConfirmCallBack(31U); g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(15U);
} }
} }
} }
...@@ -1747,261 +1747,261 @@ void RSCAN0_CH2_TX_ISR(void) ...@@ -1747,261 +1747,261 @@ void RSCAN0_CH2_TX_ISR(void)
if ((RSCAN0TMSTS32 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS32 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS32 = 0X0U; RSCAN0TMSTS32 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(0, 0); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(0, 0);
} }
} }
else if ((RSCAN0TMSTS32 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS32 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS32 = 0X0U; RSCAN0TMSTS32 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(0U);
} }
} }
if ((RSCAN0TMSTS33 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS33 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS33 = 0X0U; RSCAN0TMSTS33 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(1U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(1U, 0U);
} }
} }
else if ((RSCAN0TMSTS33 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS33 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS33 = 0X0U; RSCAN0TMSTS33 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(1U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(1U);
} }
} }
if ((RSCAN0TMSTS34 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS34 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS34 = 0X0U; RSCAN0TMSTS34 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(2U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(2U, 0U);
} }
} }
else if ((RSCAN0TMSTS34 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS34 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS34 = 0X0U; RSCAN0TMSTS34 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(2U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(2U);
} }
} }
if ((RSCAN0TMSTS35 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS35 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS35 = 0X0U; RSCAN0TMSTS35 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(3U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(3U, 0U);
} }
} }
else if ((RSCAN0TMSTS35 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS35 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS35 = 0X0U; RSCAN0TMSTS35 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(3U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(3U);
} }
} }
if ((RSCAN0TMSTS36 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS36 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS36 = 0X0U; RSCAN0TMSTS36 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(4U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(4U, 0U);
} }
} }
else if ((RSCAN0TMSTS36 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS36 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS36 = 0X0U; RSCAN0TMSTS36 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(4U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(4U);
} }
} }
if ((RSCAN0TMSTS37 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS37 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS37 = 0X0U; RSCAN0TMSTS37 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(5U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(5U, 0U);
} }
} }
else if ((RSCAN0TMSTS37 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS37 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS37 = 0X0U; RSCAN0TMSTS37 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(5U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(5U);
} }
} }
if ((RSCAN0TMSTS38 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS38 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS38 = 0X0U; RSCAN0TMSTS38 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(6U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(6U, 0U);
} }
} }
else if ((RSCAN0TMSTS38 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS38 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS38 = 0X0U; RSCAN0TMSTS38 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(6U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(6U);
} }
} }
if ((RSCAN0TMSTS39 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS39 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS39 = 0X0U; RSCAN0TMSTS39 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(7U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(7U, 0U);
} }
} }
else if ((RSCAN0TMSTS39 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS39 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS39 = 0X0U; RSCAN0TMSTS39 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(7U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(7U);
} }
} }
if ((RSCAN0TMSTS40 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS40 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS40 = 0X0U; RSCAN0TMSTS40 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(8U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(8U, 0U);
} }
} }
else if ((RSCAN0TMSTS40 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS40 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS40 = 0X0U; RSCAN0TMSTS40 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(8U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(8U);
} }
} }
if ((RSCAN0TMSTS41 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS41 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS41 = 0X0U; RSCAN0TMSTS41 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(9U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(9U, 0U);
} }
} }
else if ((RSCAN0TMSTS41 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS41 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS41 = 0X0U; RSCAN0TMSTS41 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(9U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(9U);
} }
} }
if ((RSCAN0TMSTS42 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS42 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS42 = 0X0U; RSCAN0TMSTS42 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(10U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(10U, 0U);
} }
} }
else if ((RSCAN0TMSTS42 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS42 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS42 = 0X0U; RSCAN0TMSTS42 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(10U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(10U);
} }
} }
if ((RSCAN0TMSTS43 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS43 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS43 = 0X0U; RSCAN0TMSTS43 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(11U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(11U, 0U);
} }
} }
else if ((RSCAN0TMSTS43 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS43 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS43 = 0X0U; RSCAN0TMSTS43 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(11U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(11U);
} }
} }
if ((RSCAN0TMSTS44 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS44 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS44 = 0X0U; RSCAN0TMSTS44 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(12U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(12U, 0U);
} }
} }
else if ((RSCAN0TMSTS44 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS44 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS44 = 0X0U; RSCAN0TMSTS44 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(12U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(12U);
} }
} }
if ((RSCAN0TMSTS45 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS45 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS45 = 0X0U; RSCAN0TMSTS45 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(13U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(13U, 0U);
} }
} }
else if ((RSCAN0TMSTS45 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS45 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS45 = 0X0U; RSCAN0TMSTS45 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(13U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(13U);
} }
} }
if ((RSCAN0TMSTS46 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS46 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS46 = 0X0U; RSCAN0TMSTS46 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(14U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(14U, 0U);
} }
} }
else if ((RSCAN0TMSTS46 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS46 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS46 = 0X0U; RSCAN0TMSTS46 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(14U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(14U);
} }
} }
if ((RSCAN0TMSTS47 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT) if ((RSCAN0TMSTS47 & RSCAN_TX_CPLT_AND) == RSCAN_TX_CPLT)
{ {
RSCAN0TMSTS47 = 0X0U; RSCAN0TMSTS47 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANConfirmCallBack(15U, 0U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANConfirmCallBack(15U, 0U);
} }
} }
else if ((RSCAN0TMSTS47 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT) else if ((RSCAN0TMSTS47 & RSCAN_ABORT_CPLT_AND) == RSCAN_ABORT_CPLT)
{ {
RSCAN0TMSTS47 = 0X0U; RSCAN0TMSTS47 = 0X0U;
if (g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack) if (g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack)
{ {
g_stRSCAN0Config.stRSCANCh1.pfnRSCANAbortConfirmCallBack(15U); g_stRSCAN0Config.stRSCANCh2.pfnRSCANAbortConfirmCallBack(15U);
} }
} }
} }
......
source/Driver/CAN/Rscan.h
View file @ 2da17dab
...@@ -22,7 +22,7 @@ typedef enum ...@@ -22,7 +22,7 @@ typedef enum
RSCAN_CHANNEL_BUF_11, RSCAN_CHANNEL_BUF_11,
RSCAN_CHANNEL_BUF_12, RSCAN_CHANNEL_BUF_12,
RSCAN_CHANNEL_BUF_13, RSCAN_CHANNEL_BUF_13,
RSCAN_CHANNEL_BUF_MAX, RSCAN_CHANNEL_BUF_MAX,
} RSCAN_Channel_Buf_en_t; } RSCAN_Channel_Buf_en_t;
......
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