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

Enable automatic retransmission for CAN

Browse Source
This commit is contained in:
jazzpi
2022-07-30 20:06:27 +02:00
parent 8b8b2f10f0
commit dc40179461
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Src/main.c
View File

@ -284,7 +284,7 @@ static void MX_CAN1_Init(void) {
hcan1.Init.TimeTriggeredMode = DISABLE; hcan1.Init.TimeTriggeredMode = DISABLE;
hcan1.Init.AutoBusOff = DISABLE; hcan1.Init.AutoBusOff = DISABLE;
hcan1.Init.AutoWakeUp = DISABLE; hcan1.Init.AutoWakeUp = DISABLE;
hcan1.Init.AutoRetransmission = DISABLE; hcan1.Init.AutoRetransmission = ENABLE;
hcan1.Init.ReceiveFifoLocked = DISABLE; hcan1.Init.ReceiveFifoLocked = DISABLE;
hcan1.Init.TransmitFifoPriority = DISABLE; hcan1.Init.TransmitFifoPriority = DISABLE;
if (HAL_CAN_Init(&hcan1) != HAL_OK) { if (HAL_CAN_Init(&hcan1) != HAL_OK) {
@ -318,7 +318,7 @@ static void MX_CAN2_Init(void) {
hcan2.Init.TimeTriggeredMode = DISABLE; hcan2.Init.TimeTriggeredMode = DISABLE;
hcan2.Init.AutoBusOff = DISABLE; hcan2.Init.AutoBusOff = DISABLE;
hcan2.Init.AutoWakeUp = DISABLE; hcan2.Init.AutoWakeUp = DISABLE;
hcan2.Init.AutoRetransmission = DISABLE; hcan2.Init.AutoRetransmission = ENABLE;
hcan2.Init.ReceiveFifoLocked = DISABLE; hcan2.Init.ReceiveFifoLocked = DISABLE;
hcan2.Init.TransmitFifoPriority = DISABLE; hcan2.Init.TransmitFifoPriority = DISABLE;
if (HAL_CAN_Init(&hcan2) != HAL_OK) { if (HAL_CAN_Init(&hcan2) != HAL_OK) {

2
Makefile
View File

@ -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]
########################################################################################################################## ##########################################################################################################################
# ------------------------------------------------ # ------------------------------------------------

5
ams-slave.ioc
View File

@ -5,14 +5,15 @@ 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
CAN1.NART=DISABLE CAN1.NART=ENABLE
CAN1.Prescaler=2 CAN1.Prescaler=2
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 CAN2.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,BS2,NART
CAN2.NART=ENABLE
CAN2.Prescaler=2 CAN2.Prescaler=2
Dma.Request0=USART1_RX Dma.Request0=USART1_RX
Dma.Request1=USART3_RX Dma.Request1=USART3_RX