Обновление

This commit is contained in:
cfif 2026-04-17 17:24:01 +03:00
parent bcd066ba94
commit 6ce97a410c
1 changed files with 19 additions and 7 deletions

View File

@ -29,6 +29,19 @@ static void DMA_TransferCompleteCallbackCan1(void) {
CanSerialPortFrameIrqRxProcessing(CAN_PORTS.Can1_IO.env, (uint32_t *) &g_aRxDataBufCan1[0]); CanSerialPortFrameIrqRxProcessing(CAN_PORTS.Can1_IO.env, (uint32_t *) &g_aRxDataBufCan1[0]);
} }
static void CAN0_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoType *pErrorInfo) {
FLEXCAN_ClrErrorInfo(u8CanIndex, pErrorInfo);
PROCESS_UNUSED_VAR(u8CanIndex);
PROCESS_UNUSED_VAR(pErrorInfo);
}
static void CAN0_RxInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_RxMsgType *pRxCfg) {
CanSerialPortFrameIrqRxProcessingNO_DMA(CAN_PORTS.Can0_IO.env, pRxCfg);
}
//static void DMA_ErrorCallback(void) { //static void DMA_ErrorCallback(void) {
// while (1) { // while (1) {
// __asm("nop"); // __asm("nop");
@ -159,10 +172,6 @@ const FLEXCAN_RxMbFilterType IdCanFilterFifoCan1[countIdCanFilterFifoCan1] = {
}; };
*/ */
void CAN0_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoType *pErrorInfo) {
asm("nop");
}
static bool vCanPort_InitCan0() { static bool vCanPort_InitCan0() {
vCanPort_InitCAN0RxTxPin(); vCanPort_InitCAN0RxTxPin();
@ -202,9 +211,9 @@ static bool vCanPort_InitCan0() {
FLEXCAN_BAUD_500K, FLEXCAN_BAUD_500K,
FLEXCAN_ID_STD, FLEXCAN_ID_STD,
0x55, 0x55,
CAN0_ErrorInterrupt_CallBack,
NULL, NULL,
NULL, CAN0_RxInterrupt_CallBack,
NULL,
NULL, NULL,
DMA_TransferCompleteCallbackCan0, DMA_TransferCompleteCallbackCan0,
@ -250,6 +259,7 @@ static void vCanPort_InitCAN1RxTxPin() {
} }
static bool vCanPort_InitCan1() { static bool vCanPort_InitCan1() {
vCanPort_InitCAN1RxTxPin(); vCanPort_InitCAN1RxTxPin();
bool result = vCanSerialPortFrameDMAInit( bool result = vCanSerialPortFrameDMAInit(
@ -305,6 +315,7 @@ void CanPorts_Init(tLoggerInterface *logger) {
CAN_PORTS.Can0_IO = CanPortFrame_GetIo(&CAN_PORTS.Can0); CAN_PORTS.Can0_IO = CanPortFrame_GetIo(&CAN_PORTS.Can0);
CAN_PORTS.Can1.reInit = false; CAN_PORTS.Can1.reInit = false;
/*
result = vCanPort_InitCan1(); result = vCanPort_InitCan1();
if (result) { if (result) {
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - OK") LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - OK")
@ -312,7 +323,8 @@ void CanPorts_Init(tLoggerInterface *logger) {
LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - ERROR") LoggerInfoStatic(LOGGER, LOG_SIGN, "Initialization CAN1 - ERROR")
} }
CAN_PORTS.Can1_IO = CanPortFrame_GetIo(&CAN_PORTS.Can1); CAN_PORTS.Can1_IO = CanPortFrame_GetIo(&CAN_PORTS.Can1);
} */
}
void CAN0_IRQHandler(void) { void CAN0_IRQHandler(void) {
FLEXCAN_IRQHandler(0U); FLEXCAN_IRQHandler(0U);