From 9fb5e145adc6b52b8546b4e11cc661ed97c27d65 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Tue, 2 Aug 2022 21:14:59 +0200 Subject: [PATCH] Enable automatic Bus-Off management --- Core/Src/main.c | 4 ++-- ams-slave.ioc | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index 4b002a1..2a7188b 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -285,7 +285,7 @@ static void MX_CAN1_Init(void) { hcan1.Init.TimeSeg1 = CAN_BS1_13TQ; hcan1.Init.TimeSeg2 = CAN_BS2_2TQ; hcan1.Init.TimeTriggeredMode = DISABLE; - hcan1.Init.AutoBusOff = DISABLE; + hcan1.Init.AutoBusOff = ENABLE; hcan1.Init.AutoWakeUp = DISABLE; hcan1.Init.AutoRetransmission = ENABLE; hcan1.Init.ReceiveFifoLocked = DISABLE; @@ -319,7 +319,7 @@ static void MX_CAN2_Init(void) { hcan2.Init.TimeSeg1 = CAN_BS1_13TQ; hcan2.Init.TimeSeg2 = CAN_BS2_2TQ; hcan2.Init.TimeTriggeredMode = DISABLE; - hcan2.Init.AutoBusOff = DISABLE; + hcan2.Init.AutoBusOff = ENABLE; hcan2.Init.AutoWakeUp = DISABLE; hcan2.Init.AutoRetransmission = ENABLE; hcan2.Init.ReceiveFifoLocked = DISABLE; diff --git a/ams-slave.ioc b/ams-slave.ioc index 738465f..17582ca 100644 --- a/ams-slave.ioc +++ b/ams-slave.ioc @@ -1,18 +1,20 @@ #MicroXplorer Configuration settings - do not modify +CAN1.ABOM=ENABLE CAN1.BS1=CAN_BS1_13TQ CAN1.BS2=CAN_BS2_2TQ CAN1.CalculateBaudRate=500000 CAN1.CalculateTimeBit=2000 CAN1.CalculateTimeQuantum=125.0 -CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,NART,BS1,BS2,Prescaler +CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,NART,BS1,BS2,Prescaler,ABOM CAN1.NART=ENABLE CAN1.Prescaler=2 +CAN2.ABOM=ENABLE 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,NART +CAN2.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,BS2,NART,ABOM CAN2.NART=ENABLE CAN2.Prescaler=2 Dma.Request0=USART1_RX