HVAC_M7
/
HVAC_M7_CanPorts
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление

This commit is contained in:
cfif 2026-02-13 15:59:41 +03:00
parent dc57806a84
commit 1e70d081f9
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CanPorts.c
View File

@ -115,6 +115,16 @@ const FLEXCAN_RxMbFilterType IdCanFilterFifoCan0[countIdCanFilterFifoCan0] = {
{FLEXCAN_ID_STD, Diag_Functional_CANID, 0xFFF} {FLEXCAN_ID_STD, Diag_Functional_CANID, 0xFFF}
}; };
#define countIdCanSoftFilterCan1 1
const FilterTo_FLEXCAN_RxMbFilterType IdCanSoftFilterCan1[countIdCanSoftFilterCan1] = {
{FLEXCAN_ID_STD, 0x150, 0},
};
#define countIdCanFilterFifoCan1 1
const FLEXCAN_RxMbFilterType IdCanFilterFifoCan1[countIdCanFilterFifoCan1] = {
{FLEXCAN_ID_STD, 0, 0}
};
/* /*
uint32_t data[] = { uint32_t data[] = {
0x00000150, // 50 01 00 00 0x00000150, // 50 01 00 00
@ -225,7 +235,7 @@ static void vCanPort_InitCAN1RxTxPin() {
tGpioInitStruct.ePinDirection = GPIO_IN; tGpioInitStruct.ePinDirection = GPIO_IN;
GPIO_InitPins((GPIO_InstanceType) PORT_A, &tGpioInitStruct); GPIO_InitPins((GPIO_InstanceType) PORT_A, &tGpioInitStruct);
// PortA 13: MUX = ALT3, CAN1_TX // PortA 13: MUX = ALT4, CAN1_TX
tInitStruct.u32PortPins = PORT_PIN_13; tInitStruct.u32PortPins = PORT_PIN_13;
tInitStruct.uPortPinMux.u32PortPinMode = PORTA_13_FLEXCAN1_TX; tInitStruct.uPortPinMux.u32PortPinMode = PORTA_13_FLEXCAN1_TX;
PORT_InitPins(PORT_A, &tInitStruct); PORT_InitPins(PORT_A, &tInitStruct);
@ -241,7 +251,7 @@ static bool vCanPort_InitCan1() {
bool result = vCanSerialPortFrameDMAInit( bool result = vCanSerialPortFrameDMAInit(
&CAN_PORTS.Can1, &CAN_PORTS.Can1,
FLEXCAN0, FLEXCAN1,
1, // CAN0 = 0 ... CAN3 = 3 1, // CAN0 = 0 ... CAN3 = 3
FlexCAN1_IRQn, // // FlexCAN0_IRQn ... FlexCAN3_IRQn FlexCAN1_IRQn, // // FlexCAN0_IRQn ... FlexCAN3_IRQn
@ -250,14 +260,14 @@ static bool vCanPort_InitCan1() {
DMA_REQ_FLEXCAN1, DMA_REQ_FLEXCAN1,
(uint8_t *) &g_aRxDataBufCan0[0], (uint8_t *) &g_aRxDataBufCan1[0],
size_aRxDataBuf, size_aRxDataBuf,
IdCanSoftFilterCan0, NULL,
countIdCanSoftFilterCan0, 0,
IdCanFilterFifoCan0, IdCanFilterFifoCan1,
countIdCanFilterFifoCan0, countIdCanFilterFifoCan1,
DMA1_IRQn, DMA1_IRQn,
0xFF, 0xFF,