Обновление
This commit is contained in:
parent
a3e02531a2
commit
d2cf8eade1
21
CanPorts.c
21
CanPorts.c
|
|
@ -19,11 +19,9 @@ static void CAN0_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoTy
|
||||||
PROCESS_UNUSED_VAR(pErrorInfo);
|
PROCESS_UNUSED_VAR(pErrorInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t azz0 = 0;
|
osMessageQueueId_t txDataQueueCan0 = NULL;
|
||||||
|
|
||||||
static void CAN0_TxInterruptCallBackType(uint8_t u8CanIndex, uint8_t u8TxHandler) {
|
static void CAN0_TxInterruptCallBackType(uint8_t u8CanIndex, uint8_t u8TxHandler) {
|
||||||
++azz0;
|
osMessageQueuePut(txDataQueueCan0, &u8TxHandler, 0x0, 0U);
|
||||||
asm("nop");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CAN1_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoType *pErrorInfo) {
|
static void CAN1_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoType *pErrorInfo) {
|
||||||
|
|
@ -32,15 +30,11 @@ static void CAN1_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoTy
|
||||||
PROCESS_UNUSED_VAR(pErrorInfo);
|
PROCESS_UNUSED_VAR(pErrorInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t azz1 = 0;
|
osMessageQueueId_t txDataQueueCan1 = NULL;
|
||||||
|
|
||||||
static void CAN1_TxInterruptCallBackType(uint8_t u8CanIndex, uint8_t u8TxHandler) {
|
static void CAN1_TxInterruptCallBackType(uint8_t u8CanIndex, uint8_t u8TxHandler) {
|
||||||
++azz1;
|
osMessageQueuePut(txDataQueueCan1, &u8TxHandler, 0x0, 0U);
|
||||||
asm("nop");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if (CAN_DMA_EN == 1)
|
#if (CAN_DMA_EN == 1)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
@ -191,8 +185,11 @@ const FLEXCAN_RxMbFilterType IdCanFilterFifoCan1[countIdCanFilterFifoCan1] = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static bool vCanPort_InitCan0() {
|
static bool vCanPort_InitCan0() {
|
||||||
|
|
||||||
vCanPort_InitCAN0RxTxPin();
|
vCanPort_InitCAN0RxTxPin();
|
||||||
|
|
||||||
|
txDataQueueCan0 = osMessageQueueNew(1, 1, NULL);
|
||||||
|
|
||||||
#if (CAN_DMA_EN == 1)
|
#if (CAN_DMA_EN == 1)
|
||||||
bool result = vCanSerialPortFrameDMAInit(
|
bool result = vCanSerialPortFrameDMAInit(
|
||||||
&CAN_PORTS.Can0,
|
&CAN_PORTS.Can0,
|
||||||
|
|
@ -225,7 +222,7 @@ static bool vCanPort_InitCan0() {
|
||||||
CAN0_ErrorInterrupt_CallBack,
|
CAN0_ErrorInterrupt_CallBack,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
CAN0_TxInterruptCallBackType,
|
||||||
|
|
||||||
DMA_TransferCompleteCallbackCan0,
|
DMA_TransferCompleteCallbackCan0,
|
||||||
NULL
|
NULL
|
||||||
|
|
@ -298,6 +295,8 @@ static bool vCanPort_InitCan1() {
|
||||||
|
|
||||||
vCanPort_InitCAN1RxTxPin();
|
vCanPort_InitCAN1RxTxPin();
|
||||||
|
|
||||||
|
txDataQueueCan1 = osMessageQueueNew(1, 1, NULL);
|
||||||
|
|
||||||
#if (CAN_DMA_EN == 1)
|
#if (CAN_DMA_EN == 1)
|
||||||
bool result = vCanSerialPortFrameDMAInit(
|
bool result = vCanSerialPortFrameDMAInit(
|
||||||
&CAN_PORTS.Can1,
|
&CAN_PORTS.Can1,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue