Commit 8b9d70c2 authored by 李延凯's avatar 李延凯

fix: 添加诊断周期任务, 添加项目文件链接, 添加CAN中断处理

parent b8519540
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define>USE_STDPERIPH_DRIVER,BAT32A2X9_64PIN</Define> <Define>USE_STDPERIPH_DRIVER,BAT32A2X9_64PIN</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE;..\..\..\..\Source\Component;..\..\..\..\Source\Device\Cmsemicon\BAT32A279\Library\Driver\include;..\..\..\..\Source\Device\Cmsemicon\BAT32A279\Library\Device\Include;..\..\..\..\Source\Application;..\..\..\..\Source;..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE</IncludePath> <IncludePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE;..\..\..\..\Source\Component;..\..\..\..\Source\Device\Cmsemicon\BAT32A279\Library\Driver\include;..\..\..\..\Source\Device\Cmsemicon\BAT32A279\Library\Device\Include;..\..\..\..\Source\Application;..\..\..\..\Source;..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE;..\..\..\..\Source\UDS</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>
...@@ -1000,6 +1000,56 @@ ...@@ -1000,6 +1000,56 @@
</File> </File>
</Files> </Files>
</Group> </Group>
<Group>
<GroupName>UDS</GroupName>
<Files>
<File>
<FileName>Diag_ID_Def.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\UDS\Diag_ID_Def.h</FilePath>
</File>
<File>
<FileName>DoCAN_ISO15765.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\UDS\DoCAN_ISO15765.c</FilePath>
</File>
<File>
<FileName>DoCAN_ISO15765.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\UDS\DoCAN_ISO15765.h</FilePath>
</File>
<File>
<FileName>DoCAN_ISO15765_Config.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\UDS\DoCAN_ISO15765_Config.h</FilePath>
</File>
<File>
<FileName>UDS_ISO14229_Server.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\UDS\UDS_ISO14229_Server.c</FilePath>
</File>
<File>
<FileName>UDS_ISO14229_Server.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\UDS\UDS_ISO14229_Server.h</FilePath>
</File>
<File>
<FileName>UDS_ISO14229_Server_Config.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\UDS\UDS_ISO14229_Server_Config.h</FilePath>
</File>
<File>
<FileName>UDS_ISO14229_Services.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\UDS\UDS_ISO14229_Services.c</FilePath>
</File>
<File>
<FileName>UDS_ISO14229_Services.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\UDS\UDS_ISO14229_Services.h</FilePath>
</File>
</Files>
</Group>
<Group> <Group>
<GroupName>::CMSIS</GroupName> <GroupName>::CMSIS</GroupName>
</Group> </Group>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "can.h" #include "can.h"
#include "RTE.h" #include "RTE.h"
#include "CAN_CH0_CAN_Communication_Matrix.h" #include "CAN_CH0_CAN_Communication_Matrix.h"
#include "DoCAN_ISO15765.h"
__align(4) __align(4)
uint32_t pRXBuff[CAN_RX_MSG_Block * CAN_CH0_ID_TOTAL_MAX]; uint32_t pRXBuff[CAN_RX_MSG_Block * CAN_CH0_ID_TOTAL_MAX];
...@@ -164,10 +164,10 @@ void Can_Rx_Cak(CanTxRxMsg *Msg) ...@@ -164,10 +164,10 @@ void Can_Rx_Cak(CanTxRxMsg *Msg)
{ {
Co_Can_Buff_Set(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(Msg->Id), Msg->DLC, Msg->Data); Co_Can_Buff_Set(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(Msg->Id), Msg->DLC, Msg->Data);
// if ((Msg->Id == DIAG_ID_Rx_FUN) || (Msg->Id == DIAG_ID_Rx_PHY)) if ((Msg->Id == DIAG_ID_Rx_FUN) || (Msg->Id == DIAG_ID_Rx_PHY))
// { {
// DoCAN_L_Data_Indication(Msg->Id, Msg->DLC, Msg->Data); DoCAN_L_Data_Indication(Msg->Id, Msg->DLC, Msg->Data);
// } }
} }
/** /**
* @brief CAN库初始化TX/RX * @brief CAN库初始化TX/RX
......
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
#include "Components.h" #include "Components.h"
//#include "CommonInterface.h" //#include "CommonInterface.h"
#include "RTE.h" #include "RTE.h"
#include "UDS_ISO14229_Server.h"
void Sys_Pseudo_Real_Time_Tasks(void) void Sys_Pseudo_Real_Time_Tasks(void)
{ {
Power_Management_Service(); Power_Management_Service();
DoCAN_Communication_Service();
UDS_Server_Application_Service();
} }
void Sys_2ms_Tasks(void) void Sys_2ms_Tasks(void)
...@@ -15,6 +18,7 @@ void Sys_2ms_Tasks(void) ...@@ -15,6 +18,7 @@ void Sys_2ms_Tasks(void)
Sys_Status_Update_Service(); Sys_Status_Update_Service();
Analog_Signal_Conv_Service(); Analog_Signal_Conv_Service();
AMT630H_Main(); AMT630H_Main();
DoCAN_Timer_Update(2000u);
//Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发 //Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发
CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u); CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u);
} }
...@@ -51,6 +55,7 @@ void Sys_50ms_Tasks(void) ...@@ -51,6 +55,7 @@ void Sys_50ms_Tasks(void)
void Sys_100ms_Tasks(void) void Sys_100ms_Tasks(void)
{ {
S3_ServerCNTT();
Get_DisTime_Service(); Get_DisTime_Service();
Fuel_Cal_Sevice(100u); Fuel_Cal_Sevice(100u);
Coolant_Cal_Sevice(100u); Coolant_Cal_Sevice(100u);
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#ifndef _DIAG_ID_DEF_H_ #ifndef _DIAG_ID_DEF_H_
#define _DIAG_ID_DEF_H_ #define _DIAG_ID_DEF_H_
#define DIAG_ID_Tx 0x07E8 /*发送ID*/ #define DIAG_ID_Tx 0x0789 /*发送ID*/
#define DIAG_ID_Rx_PHY 0x07E0 /*接收ID,物理寻址*/ #define DIAG_ID_Rx_PHY 0x0781 /*接收ID,物理寻址*/
#define DIAG_ID_Rx_FUN 0x07DF /*接收ID,功能寻址*/ #define DIAG_ID_Rx_FUN 0x07DF /*接收ID,功能寻址*/
#endif #endif
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
******************************************************************************/ ******************************************************************************/
#include "DoCAN_ISO15765.h" #include "DoCAN_ISO15765.h"
#include "Application.h"
#include "can.h" #include "can.h"
LinkRxFIFOStruct LinkRxFIFO; LinkRxFIFOStruct LinkRxFIFO;
......
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