From 213bb5c191333e289ec132329158493b6dc8895b Mon Sep 17 00:00:00 2001 From: Oliver Walter Date: Mon, 5 Feb 2024 14:22:56 +0100 Subject: [PATCH] set CLS CAN to 500kbit --- .gitignore | 4 +++- CLS_Master.ioc | 8 ++++---- Core/Src/fdcan.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a23d8a7..f0cccb7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ build/ venv/ tools/*_pb2.py tools/__pycache__ -tools/**/*.bin \ No newline at end of file +tools/**/*.bin +cmake-build* +.idea diff --git a/CLS_Master.ioc b/CLS_Master.ioc index b8fd091..2c92b50 100644 --- a/CLS_Master.ioc +++ b/CLS_Master.ioc @@ -115,14 +115,14 @@ FATFS0.BSP.mode=Input FATFS0.BSP.name=Detect_SDIO FATFS0.BSP.semaphore= FATFS0.BSP.solution=PA15(JTDI) -FDCAN1.CalculateBaudRateNominal=999999 -FDCAN1.CalculateTimeBitNominal=1000 +FDCAN1.CalculateBaudRateNominal=499999 +FDCAN1.CalculateTimeBitNominal=2000 FDCAN1.CalculateTimeQuantumNominal=100.00000000000001 FDCAN1.ExtFiltersNbr=0 FDCAN1.IPParameters=CalculateTimeQuantumNominal,CalculateTimeBitNominal,CalculateBaudRateNominal,TxFifoQueueElmtsNbr,TxBuffersNbr,TxEventsNbr,RxBuffersNbr,RxFifo1ElmtsNbr,RxFifo0ElmtsNbr,NominalPrescaler,NominalTimeSeg1,NominalTimeSeg2,StdFiltersNbr,ExtFiltersNbr FDCAN1.NominalPrescaler=11 -FDCAN1.NominalTimeSeg1=3 -FDCAN1.NominalTimeSeg2=6 +FDCAN1.NominalTimeSeg1=15 +FDCAN1.NominalTimeSeg2=4 FDCAN1.RxBuffersNbr=0 FDCAN1.RxFifo0ElmtsNbr=8 FDCAN1.RxFifo1ElmtsNbr=8 diff --git a/Core/Src/fdcan.c b/Core/Src/fdcan.c index 8a2f81e..0a53f46 100644 --- a/Core/Src/fdcan.c +++ b/Core/Src/fdcan.c @@ -46,8 +46,8 @@ void MX_FDCAN1_Init(void) hfdcan1.Init.ProtocolException = DISABLE; hfdcan1.Init.NominalPrescaler = 11; hfdcan1.Init.NominalSyncJumpWidth = 1; - hfdcan1.Init.NominalTimeSeg1 = 3; - hfdcan1.Init.NominalTimeSeg2 = 6; + hfdcan1.Init.NominalTimeSeg1 = 15; + hfdcan1.Init.NominalTimeSeg2 = 4; hfdcan1.Init.DataPrescaler = 1; hfdcan1.Init.DataSyncJumpWidth = 1; hfdcan1.Init.DataTimeSeg1 = 1;