oliver/cls_master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update cubeMX FDCAN1

Browse Source
This commit is contained in:
Oliver Walter
2024-02-04 17:14:57 +01:00
parent 5cc20a3cb4
commit 0a72c8b553
5 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.mxproject
View File

File diff suppressed because one or more lines are too long

16
CLS_Master.ioc
View File

@@ -118,18 +118,18 @@ FATFS0.BSP.solution=PA15(JTDI)
FDCAN1.CalculateBaudRateNominal=999999 FDCAN1.CalculateBaudRateNominal=999999
FDCAN1.CalculateTimeBitNominal=1000 FDCAN1.CalculateTimeBitNominal=1000
FDCAN1.CalculateTimeQuantumNominal=100.00000000000001 FDCAN1.CalculateTimeQuantumNominal=100.00000000000001
FDCAN1.ExtFiltersNbr=1 FDCAN1.ExtFiltersNbr=0
FDCAN1.IPParameters=CalculateTimeQuantumNominal,CalculateTimeBitNominal,CalculateBaudRateNominal,TxFifoQueueElmtsNbr,TxBuffersNbr,TxEventsNbr,RxBuffersNbr,RxFifo1ElmtsNbr,RxFifo0ElmtsNbr,NominalPrescaler,NominalTimeSeg1,NominalTimeSeg2,StdFiltersNbr,ExtFiltersNbr FDCAN1.IPParameters=CalculateTimeQuantumNominal,CalculateTimeBitNominal,CalculateBaudRateNominal,TxFifoQueueElmtsNbr,TxBuffersNbr,TxEventsNbr,RxBuffersNbr,RxFifo1ElmtsNbr,RxFifo0ElmtsNbr,NominalPrescaler,NominalTimeSeg1,NominalTimeSeg2,StdFiltersNbr,ExtFiltersNbr
FDCAN1.NominalPrescaler=11 FDCAN1.NominalPrescaler=11
FDCAN1.NominalTimeSeg1=3 FDCAN1.NominalTimeSeg1=3
FDCAN1.NominalTimeSeg2=6 FDCAN1.NominalTimeSeg2=6
FDCAN1.RxBuffersNbr=1 FDCAN1.RxBuffersNbr=0
FDCAN1.RxFifo0ElmtsNbr=1 FDCAN1.RxFifo0ElmtsNbr=8
FDCAN1.RxFifo1ElmtsNbr=2 FDCAN1.RxFifo1ElmtsNbr=8
FDCAN1.StdFiltersNbr=1 FDCAN1.StdFiltersNbr=100
FDCAN1.TxBuffersNbr=1 FDCAN1.TxBuffersNbr=8
FDCAN1.TxEventsNbr=2 FDCAN1.TxEventsNbr=0
FDCAN1.TxFifoQueueElmtsNbr=1 FDCAN1.TxFifoQueueElmtsNbr=8
FDCAN2.CalculateBaudRateNominal=99999 FDCAN2.CalculateBaudRateNominal=99999
FDCAN2.CalculateTimeBitNominal=10000 FDCAN2.CalculateTimeBitNominal=10000
FDCAN2.CalculateTimeQuantumNominal=500.00000000000006 FDCAN2.CalculateTimeQuantumNominal=500.00000000000006

16
Core/Src/fdcan.c
View File

@@ -53,17 +53,17 @@ void MX_FDCAN1_Init(void)
hfdcan1.Init.DataTimeSeg1 = 1; hfdcan1.Init.DataTimeSeg1 = 1;
hfdcan1.Init.DataTimeSeg2 = 1; hfdcan1.Init.DataTimeSeg2 = 1;
hfdcan1.Init.MessageRAMOffset = 0; hfdcan1.Init.MessageRAMOffset = 0;
hfdcan1.Init.StdFiltersNbr = 1; hfdcan1.Init.StdFiltersNbr = 100;
hfdcan1.Init.ExtFiltersNbr = 1; hfdcan1.Init.ExtFiltersNbr = 0;
hfdcan1.Init.RxFifo0ElmtsNbr = 1; hfdcan1.Init.RxFifo0ElmtsNbr = 8;
hfdcan1.Init.RxFifo0ElmtSize = FDCAN_DATA_BYTES_8; hfdcan1.Init.RxFifo0ElmtSize = FDCAN_DATA_BYTES_8;
hfdcan1.Init.RxFifo1ElmtsNbr = 2; hfdcan1.Init.RxFifo1ElmtsNbr = 8;
hfdcan1.Init.RxFifo1ElmtSize = FDCAN_DATA_BYTES_8; hfdcan1.Init.RxFifo1ElmtSize = FDCAN_DATA_BYTES_8;
hfdcan1.Init.RxBuffersNbr = 1; hfdcan1.Init.RxBuffersNbr = 0;
hfdcan1.Init.RxBufferSize = FDCAN_DATA_BYTES_8; hfdcan1.Init.RxBufferSize = FDCAN_DATA_BYTES_8;
hfdcan1.Init.TxEventsNbr = 2; hfdcan1.Init.TxEventsNbr = 0;
hfdcan1.Init.TxBuffersNbr = 1; hfdcan1.Init.TxBuffersNbr = 8;
hfdcan1.Init.TxFifoQueueElmtsNbr = 1; hfdcan1.Init.TxFifoQueueElmtsNbr = 8;
hfdcan1.Init.TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION; hfdcan1.Init.TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
hfdcan1.Init.TxElmtSize = FDCAN_DATA_BYTES_8; hfdcan1.Init.TxElmtSize = FDCAN_DATA_BYTES_8;
if (HAL_FDCAN_Init(&hfdcan1) != HAL_OK) if (HAL_FDCAN_Init(&hfdcan1) != HAL_OK)

4
Core/Src/freertos.c
View File

@@ -22,10 +22,10 @@
#include "task.h" #include "task.h"
#include "main.h" #include "main.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "fatfs.h"
/* Private includes ----------------------------------------------------------*/ /* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */ /* USER CODE BEGIN Includes */
#include "UsbDataHandler.h" #include "UsbDataHandler.h"
#include "fatfs.h"
/* USER CODE END Includes */ /* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/ /* Private typedef -----------------------------------------------------------*/
@@ -115,7 +115,7 @@ void MX_FREERTOS_Init(void) {
void StartDefaultTask(void *argument) void StartDefaultTask(void *argument)
{ {
/* init code for USB_DEVICE */ /* init code for USB_DEVICE */
/* USER CODE BEGIN StartDefaultTask */ /* USER CODE BEGIN StartDefaultTask */
retSD = f_mount(&SDFatFS,SDPath,0); retSD = f_mount(&SDFatFS,SDPath,0);

5
Core/Src/main.c
View File

@@ -117,7 +117,7 @@ int main(void)
MX_USART3_UART_Init(); MX_USART3_UART_Init();
MX_RTC_Init(); MX_RTC_Init();
MX_SDMMC1_SD_Init(); MX_SDMMC1_SD_Init();
MX_ADC1_Init(); MX_ADC1_Init();
MX_FDCAN1_Init(); MX_FDCAN1_Init();
MX_FDCAN2_Init(); MX_FDCAN2_Init();
MX_I2C1_Init(); MX_I2C1_Init();
@@ -130,7 +130,7 @@ int main(void)
/* Init scheduler */ /* Init scheduler */
osKernelInitialize(); /* Call init function for freertos objects (in freertos.c) */ osKernelInitialize(); /* Call init function for freertos objects (in freertos.c) */
MX_FREERTOS_Init(); MX_FREERTOS_Init();
MX_FATFS_Init(); MX_FATFS_Init();
/* Start scheduler */ /* Start scheduler */
osKernelStart(); osKernelStart();
@@ -247,7 +247,6 @@ void MPU_Initialize(void) {
void MPU_Config(void) void MPU_Config(void)
{ {
MPU_Region_InitTypeDef MPU_InitStruct = {0}; MPU_Region_InitTypeDef MPU_InitStruct = {0};
/* Disables the MPU */ /* Disables the MPU */