From dc40179461511879989a3627e69e486538da49ed Mon Sep 17 00:00:00 2001 From: jazzpi Date: Sat, 30 Jul 2022 20:06:27 +0200 Subject: [PATCH] Enable automatic retransmission for CAN --- Core/Src/main.c | 4 ++-- Makefile | 2 +- ams-slave.ioc | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index 33c2124..c980e20 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -284,7 +284,7 @@ static void MX_CAN1_Init(void) { hcan1.Init.TimeTriggeredMode = DISABLE; hcan1.Init.AutoBusOff = DISABLE; hcan1.Init.AutoWakeUp = DISABLE; - hcan1.Init.AutoRetransmission = DISABLE; + hcan1.Init.AutoRetransmission = ENABLE; hcan1.Init.ReceiveFifoLocked = DISABLE; hcan1.Init.TransmitFifoPriority = DISABLE; if (HAL_CAN_Init(&hcan1) != HAL_OK) { @@ -318,7 +318,7 @@ static void MX_CAN2_Init(void) { hcan2.Init.TimeTriggeredMode = DISABLE; hcan2.Init.AutoBusOff = DISABLE; hcan2.Init.AutoWakeUp = DISABLE; - hcan2.Init.AutoRetransmission = DISABLE; + hcan2.Init.AutoRetransmission = ENABLE; hcan2.Init.ReceiveFifoLocked = DISABLE; hcan2.Init.TransmitFifoPriority = DISABLE; if (HAL_CAN_Init(&hcan2) != HAL_OK) { diff --git a/Makefile b/Makefile index 086f554..209c29f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Sat Jul 30 20:00:40 CEST 2022] +# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Sat Jul 30 20:03:51 CEST 2022] ########################################################################################################################## # ------------------------------------------------ diff --git a/ams-slave.ioc b/ams-slave.ioc index 21d374c..8291d56 100644 --- a/ams-slave.ioc +++ b/ams-slave.ioc @@ -5,14 +5,15 @@ CAN1.CalculateBaudRate=500000 CAN1.CalculateTimeBit=2000 CAN1.CalculateTimeQuantum=125.0 CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,NART,BS1,BS2,Prescaler -CAN1.NART=DISABLE +CAN1.NART=ENABLE CAN1.Prescaler=2 CAN2.BS1=CAN_BS1_13TQ CAN2.BS2=CAN_BS2_2TQ CAN2.CalculateBaudRate=500000 CAN2.CalculateTimeBit=2000 CAN2.CalculateTimeQuantum=125.0 -CAN2.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,BS2 +CAN2.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,BS2,NART +CAN2.NART=ENABLE CAN2.Prescaler=2 Dma.Request0=USART1_RX Dma.Request1=USART3_RX