From 67b3d6cf820c1f394748c8971ec9b0c718a6f604 Mon Sep 17 00:00:00 2001 From: bartool Date: Fri, 29 Sep 2023 20:42:39 +0200 Subject: [PATCH] spi mode fix --- Core/Src/spi.c | 4 ++-- Makefile | 2 +- app/drivers/ad9833/ad9833.h | 4 ++-- fun_gen_amp_test.ioc | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Core/Src/spi.c b/Core/Src/spi.c index 4048d76..5bcf106 100644 --- a/Core/Src/spi.c +++ b/Core/Src/spi.c @@ -41,11 +41,11 @@ void MX_SPI2_Init(void) hspi2.Instance = SPI2; hspi2.Init.Mode = SPI_MODE_MASTER; hspi2.Init.Direction = SPI_DIRECTION_1LINE; - hspi2.Init.DataSize = SPI_DATASIZE_4BIT; + hspi2.Init.DataSize = SPI_DATASIZE_8BIT; hspi2.Init.CLKPolarity = SPI_POLARITY_LOW; hspi2.Init.CLKPhase = SPI_PHASE_1EDGE; hspi2.Init.NSS = SPI_NSS_SOFT; - hspi2.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; + hspi2.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_32; hspi2.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi2.Init.TIMode = SPI_TIMODE_DISABLE; hspi2.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; diff --git a/Makefile b/Makefile index a7385eb..7e915c2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Tue Sep 26 19:16:56 CEST 2023] +# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Fri Sep 29 20:40:01 CEST 2023] ########################################################################################################################## # ------------------------------------------------ diff --git a/app/drivers/ad9833/ad9833.h b/app/drivers/ad9833/ad9833.h index a5a98e3..fbe43aa 100644 --- a/app/drivers/ad9833/ad9833.h +++ b/app/drivers/ad9833/ad9833.h @@ -4,8 +4,8 @@ #define AD_DEFAULT_FREQ 1000U ///< Default initialisation frequency (Hz) #define AD_DEFAULT_PHASE 0 ///< Default initialisation phase angle (degrees) -#define AD_MCLK 25000000U ///< Clock speed of the AD9833 reference clock in Hz -#define AD_MCLK_DIV2 12500000U ///< Clock speed of the AD9833 reference clock in Hz +#define AD_MCLK 24000000U ///< Clock speed of the AD9833 reference clock in Hz +#define AD_MCLK_DIV2 12000000U ///< Clock speed of the AD9833 reference clock in Hz /** * Channel enumerated type. * diff --git a/fun_gen_amp_test.ioc b/fun_gen_amp_test.ioc index 6164091..564082d 100644 --- a/fun_gen_amp_test.ioc +++ b/fun_gen_amp_test.ioc @@ -263,10 +263,11 @@ SH.S_TIM3_CH1.0=TIM3_CH1,Encoder_Interface SH.S_TIM3_CH1.ConfNb=1 SH.S_TIM3_CH2.0=TIM3_CH2,Encoder_Interface SH.S_TIM3_CH2.ConfNb=1 -SPI2.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_2 -SPI2.CalculateBaudRate=12.0 MBits/s +SPI2.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_32 +SPI2.CalculateBaudRate=750.0 KBits/s +SPI2.DataSize=SPI_DATASIZE_8BIT SPI2.Direction=SPI_DIRECTION_1LINE -SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler +SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler,DataSize SPI2.Mode=SPI_MODE_MASTER SPI2.VirtualType=VM_MASTER SPI3.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_32