diff --git a/Core/Src/can.c b/Core/Src/can.c index 9f4e0cf..d2fa7ae 100644 --- a/Core/Src/can.c +++ b/Core/Src/can.c @@ -49,7 +49,7 @@ void MX_CAN1_Init(void) hcan1.Init.AutoWakeUp = DISABLE; hcan1.Init.AutoRetransmission = ENABLE; hcan1.Init.ReceiveFifoLocked = DISABLE; - hcan1.Init.TransmitFifoPriority = ENABLE; + hcan1.Init.TransmitFifoPriority = DISABLE; if (HAL_CAN_Init(&hcan1) != HAL_OK) { Error_Handler(); @@ -81,7 +81,7 @@ void MX_CAN2_Init(void) hcan2.Init.AutoWakeUp = DISABLE; hcan2.Init.AutoRetransmission = ENABLE; hcan2.Init.ReceiveFifoLocked = DISABLE; - hcan2.Init.TransmitFifoPriority = ENABLE; + hcan2.Init.TransmitFifoPriority = DISABLE; if (HAL_CAN_Init(&hcan2) != HAL_OK) { Error_Handler(); diff --git a/DevC.ioc b/DevC.ioc index 0a7cb06..55a6081 100644 --- a/DevC.ioc +++ b/DevC.ioc @@ -23,7 +23,7 @@ CAN1.CalculateTimeQuantum=71.42857142857143 CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,BS2,NART,TXFP CAN1.NART=ENABLE CAN1.Prescaler=3 -CAN1.TXFP=ENABLE +CAN1.TXFP=DISABLE CAN2.BS1=CAN_BS1_6TQ CAN2.BS2=CAN_BS2_7TQ CAN2.CalculateBaudRate=1000000 @@ -32,7 +32,7 @@ CAN2.CalculateTimeQuantum=71.42857142857143 CAN2.IPParameters=CalculateTimeQuantum,BS1,BS2,Prescaler,TXFP,CalculateTimeBit,CalculateBaudRate,NART CAN2.NART=ENABLE CAN2.Prescaler=3 -CAN2.TXFP=ENABLE +CAN2.TXFP=DISABLE Dma.I2C2_TX.2.Direction=DMA_MEMORY_TO_PERIPH Dma.I2C2_TX.2.FIFOMode=DMA_FIFOMODE_DISABLE Dma.I2C2_TX.2.Instance=DMA1_Stream7