FaSTTUBe/ams-slave-22
51
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable automatic Bus-Off management

Browse Source
This commit is contained in:
jazzpi
2022-08-02 21:14:59 +02:00
parent 2f267110a9
commit 9fb5e145ad
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Src/main.c
View File

@ -285,7 +285,7 @@ static void MX_CAN1_Init(void) {
hcan1.Init.TimeSeg1 = CAN_BS1_13TQ; hcan1.Init.TimeSeg1 = CAN_BS1_13TQ;
hcan1.Init.TimeSeg2 = CAN_BS2_2TQ; hcan1.Init.TimeSeg2 = CAN_BS2_2TQ;
hcan1.Init.TimeTriggeredMode = DISABLE; hcan1.Init.TimeTriggeredMode = DISABLE;
hcan1.Init.AutoBusOff = DISABLE; hcan1.Init.AutoBusOff = ENABLE;
hcan1.Init.AutoWakeUp = DISABLE; hcan1.Init.AutoWakeUp = DISABLE;
hcan1.Init.AutoRetransmission = ENABLE; hcan1.Init.AutoRetransmission = ENABLE;
hcan1.Init.ReceiveFifoLocked = DISABLE; hcan1.Init.ReceiveFifoLocked = DISABLE;
@ -319,7 +319,7 @@ static void MX_CAN2_Init(void) {
hcan2.Init.TimeSeg1 = CAN_BS1_13TQ; hcan2.Init.TimeSeg1 = CAN_BS1_13TQ;
hcan2.Init.TimeSeg2 = CAN_BS2_2TQ; hcan2.Init.TimeSeg2 = CAN_BS2_2TQ;
hcan2.Init.TimeTriggeredMode = DISABLE; hcan2.Init.TimeTriggeredMode = DISABLE;
hcan2.Init.AutoBusOff = DISABLE; hcan2.Init.AutoBusOff = ENABLE;
hcan2.Init.AutoWakeUp = DISABLE; hcan2.Init.AutoWakeUp = DISABLE;
hcan2.Init.AutoRetransmission = ENABLE; hcan2.Init.AutoRetransmission = ENABLE;
hcan2.Init.ReceiveFifoLocked = DISABLE; hcan2.Init.ReceiveFifoLocked = DISABLE;

6
ams-slave.ioc
View File

@ -1,18 +1,20 @@
#MicroXplorer Configuration settings - do not modify #MicroXplorer Configuration settings - do not modify
CAN1.ABOM=ENABLE
CAN1.BS1=CAN_BS1_13TQ CAN1.BS1=CAN_BS1_13TQ
CAN1.BS2=CAN_BS2_2TQ CAN1.BS2=CAN_BS2_2TQ
CAN1.CalculateBaudRate=500000 CAN1.CalculateBaudRate=500000
CAN1.CalculateTimeBit=2000 CAN1.CalculateTimeBit=2000
CAN1.CalculateTimeQuantum=125.0 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.NART=ENABLE
CAN1.Prescaler=2 CAN1.Prescaler=2
CAN2.ABOM=ENABLE
CAN2.BS1=CAN_BS1_13TQ CAN2.BS1=CAN_BS1_13TQ
CAN2.BS2=CAN_BS2_2TQ CAN2.BS2=CAN_BS2_2TQ
CAN2.CalculateBaudRate=500000 CAN2.CalculateBaudRate=500000
CAN2.CalculateTimeBit=2000 CAN2.CalculateTimeBit=2000
CAN2.CalculateTimeQuantum=125.0 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.NART=ENABLE
CAN2.Prescaler=2 CAN2.Prescaler=2
Dma.Request0=USART1_RX Dma.Request0=USART1_RX