Исправлен инициализация интерфейса CAN
This commit is contained in:
parent
a6cf81908a
commit
446ae100fe
|
|
@ -274,14 +274,14 @@ const FLEXCAN_RxMbFilterType IdCanFilterFifoCan0[countIdCanFilterFifoCan0] = {
|
||||||
#define countIdCanSoftFilterCan1 2
|
#define countIdCanSoftFilterCan1 2
|
||||||
const FilterTo_FLEXCAN_RxMbFilterType IdCanSoftFilterCan1[countIdCanSoftFilterCan1] = {
|
const FilterTo_FLEXCAN_RxMbFilterType IdCanSoftFilterCan1[countIdCanSoftFilterCan1] = {
|
||||||
{FLEXCAN_ID_STD, XCP_CCU_RX_CANID, 0x7FF, PROTOCOL_CAN_XCP},
|
{FLEXCAN_ID_STD, XCP_CCU_RX_CANID, 0x7FF, PROTOCOL_CAN_XCP},
|
||||||
{FLEXCAN_ID_STD, dbg_Cmd_Act_Information_CANID, 0x7FF, PROTOCOL_CAN_RAW}
|
{FLEXCAN_ID_STD, dbg_Act_debug_command_CANID, 0x7FF, PROTOCOL_CAN_RAW}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define countIdCanHardFilterCan1 2
|
#define countIdCanHardFilterCan1 2
|
||||||
const FilterTo_FLEXCAN_RxMbFilterType IdCanHardFilterCan1[countIdCanHardFilterCan1] = {
|
const FilterTo_FLEXCAN_RxMbFilterType IdCanHardFilterCan1[countIdCanHardFilterCan1] = {
|
||||||
{FLEXCAN_ID_STD, XCP_CCU_RX_CANID, 0x7FF, PROTOCOL_CAN_XCP},
|
{FLEXCAN_ID_STD, XCP_CCU_RX_CANID, 0x7FF, PROTOCOL_CAN_XCP},
|
||||||
{FLEXCAN_ID_STD, dbg_Cmd_Act_Information_CANID, 0x7FF, PROTOCOL_CAN_RAW}
|
{FLEXCAN_ID_STD, dbg_Act_debug_command_CANID, 0x7FF, PROTOCOL_CAN_RAW}
|
||||||
};
|
};
|
||||||
|
|
||||||
#if (CAN_DMA_EN == 1)
|
#if (CAN_DMA_EN == 1)
|
||||||
|
|
@ -471,15 +471,18 @@ bool vCanPort_InitCan1() {
|
||||||
void CanPorts_Init(tLoggerInterface *logger) {
|
void CanPorts_Init(tLoggerInterface *logger) {
|
||||||
|
|
||||||
CAN_PORTS.Can0.reInitOne = false;
|
CAN_PORTS.Can0.reInitOne = false;
|
||||||
|
CAN_PORTS.Can0_IO = CanPortFrame_GetIo(&CAN_PORTS.Can0);
|
||||||
|
|
||||||
bool result = vCanPort_InitCan0();
|
bool result = vCanPort_InitCan0();
|
||||||
if (result) {
|
if (result) {
|
||||||
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN0 - OK")
|
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN0 - OK")
|
||||||
} else {
|
} else {
|
||||||
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN0 - ERROR")
|
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN0 - ERROR")
|
||||||
}
|
}
|
||||||
CAN_PORTS.Can0_IO = CanPortFrame_GetIo(&CAN_PORTS.Can0);
|
|
||||||
|
|
||||||
CAN_PORTS.Can1.reInitOne = false;
|
CAN_PORTS.Can1.reInitOne = false;
|
||||||
|
CAN_PORTS.Can1_IO = CanPortFrame_GetIo(&CAN_PORTS.Can1);
|
||||||
|
|
||||||
result = vCanPort_InitCan1();
|
result = vCanPort_InitCan1();
|
||||||
if (result) {
|
if (result) {
|
||||||
|
|
@ -487,7 +490,6 @@ void CanPorts_Init(tLoggerInterface *logger) {
|
||||||
} else {
|
} else {
|
||||||
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - ERROR")
|
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - ERROR")
|
||||||
}
|
}
|
||||||
CAN_PORTS.Can1_IO = CanPortFrame_GetIo(&CAN_PORTS.Can1);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -239,8 +239,8 @@ static void Mma_InitSubSystems(tMma *env) {
|
||||||
&env->canPorts->Can1_IO,
|
&env->canPorts->Can1_IO,
|
||||||
&env->rtcs->rtcI0,
|
&env->rtcs->rtcI0,
|
||||||
|
|
||||||
0x00000000,
|
0x21000000,//0x00000000,
|
||||||
nf_storage_calib_size,
|
0x21000000 + 32 * 1024,//nf_storage_calib_size,
|
||||||
|
|
||||||
nf_storage_calib_mainFlashPageAddress,
|
nf_storage_calib_mainFlashPageAddress,
|
||||||
nf_storage_calib_recoveryFlashPageAddress + nf_storage_calib_size,
|
nf_storage_calib_recoveryFlashPageAddress + nf_storage_calib_size,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue