mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-06 03:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

stm32-f4discovery-cc256x: added hint regarding _printf_float

Browse Source 
stm32-f4discovery-cc256x: added bsp api to fetch the actual sampling rate
stm32-f4discovery-cc256x: switched clock source to HSE instead of HSI
stm32-f4discovery-cc256x: fixed wrong i2spll parameters
This commit is contained in:
Dirk Helbig 2023-05-11 12:41:23 +02:00 committed by Matthias Ringwald
parent 32d9a3dfcc
commit 2d8556b2db
4 changed files with 92 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/embedded/btstack_audio_embedded.c
View File

@ -158,7 +158,7 @@ static int btstack_audio_embedded_sink_init(
} }
static uint32_t btstack_audio_embedded_sink_get_samplerate() { static uint32_t btstack_audio_embedded_sink_get_samplerate() {
return sink_samplerate; return BSP_AUDIO_OUT_GetFrequency();
} }
static uint32_t source_samplerate = 0; static uint32_t source_samplerate = 0;

1
port/stm32-f4discovery-cc256x/Makefile
View File

@ -305,6 +305,7 @@ LDSCRIPT = STM32F407VGTx_FLASH.ld
LIBS = -lPDMFilter_CM4_GCC -lc -lm -lnosys LIBS = -lPDMFilter_CM4_GCC -lc -lm -lnosys
LIBDIR = -Lpdm LIBDIR = -Lpdm
LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
# this is required for libc based compiler if printf support for floating point is needed
#LDFLAGS += -u_printf_float #LDFLAGS += -u_printf_float
# default action: build all # default action: build all

22
port/stm32-f4discovery-cc256x/Src/main.c
View File

@ -121,29 +121,29 @@ void SystemClock_Config(void)
*/ */
__HAL_RCC_PWR_CLK_ENABLE(); __HAL_RCC_PWR_CLK_ENABLE();
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
/** Initializes the CPU, AHB and APB busses clocks /** Initializes the RCC Oscillators according to the specified parameters
* in the RCC_OscInitTypeDef structure.
*/ */
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI; RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
RCC_OscInitStruct.HSIState = RCC_HSI_ON; RCC_OscInitStruct.HSEState = RCC_HSE_ON;
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
RCC_OscInitStruct.PLL.PLLM = 8; RCC_OscInitStruct.PLL.PLLM = 4;
RCC_OscInitStruct.PLL.PLLN = 64; RCC_OscInitStruct.PLL.PLLN = 192;
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV6;
RCC_OscInitStruct.PLL.PLLQ = 7; RCC_OscInitStruct.PLL.PLLQ = 8;
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
{ {
Error_Handler(); Error_Handler();
} }
/** Initializes the CPU, AHB and APB busses clocks /** Initializes the CPU, AHB and APB buses clocks
*/ */
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2; RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV4; RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
{ {

139
port/stm32-f4discovery-cc256x/bsp/stm32f4_discovery_audio.c
View File

@ -159,10 +159,47 @@ b) RECORD A FILE:
/** @defgroup STM32F4_DISCOVERY_AUDIO_Private_Defines STM32F4 DISCOVERY AUDIO Private Defines /** @defgroup STM32F4_DISCOVERY_AUDIO_Private_Defines STM32F4 DISCOVERY AUDIO Private Defines
* @{ * @{
*/ */
/* These PLL parameters are valid when the f(VCO clock) = 1Mhz */ static uint32_t bsp_audio_out_actual_frequency = 0;
static const uint32_t I2SFreq[8] = {8000, 11025, 16000, 22050, 32000, 44100, 48000, 96000}; static uint32_t bsp_audio_out_frequency = 0;
static const uint32_t I2SPLLN[8] = {256, 429, 213, 429, 426, 271, 258, 344};
static const uint32_t I2SPLLR[8] = {5, 4, 4, 4, 4, 6, 3, 1}; typedef struct {
uint32_t freq;
uint32_t actual;
uint16_t r;
uint16_t n;
} i2s_pll_entry_t;
// HSE_VALUE = 8000000
// PLLM = 4
// MCK on
static const i2s_pll_entry_t i2s_pll_table[] = {
{ 8000, 8000, 5, 128 }, /* i2sdiv: 12, odd: 1, rate error % (desired vs actual)%: 0.0000 */
{ 11025, 11024, 2, 127 }, /* i2sdiv: 22, odd: 1, rate error % (desired vs actual)%: 0.0063 */
{ 12000, 12000, 5, 192 }, /* i2sdiv: 12, odd: 1, rate error % (desired vs actual)%: 0.0000 */
{ 16000, 16000, 4, 213 }, /* i2sdiv: 13, odd: 0, rate error % (desired vs actual)%: 0.0038 */
{ 22050, 22048, 5, 127 }, /* i2sdiv: 4, odd: 1, rate error % (desired vs actual)%: 0.0063 */
{ 24000, 24003, 3, 212 }, /* i2sdiv: 11, odd: 1, rate error % (desired vs actual)%: 0.0151 */
{ 32000, 32001, 4, 213 }, /* i2sdiv: 6, odd: 1, rate error % (desired vs actual)%: 0.0038 */
{ 44100, 44084, 2, 79 }, /* i2sdiv: 3, odd: 1, rate error % (desired vs actual)%: 0.0344 */
{ 48000, 47991, 2, 86 }, /* i2sdiv: 3, odd: 1, rate error % (desired vs actual)%: 0.0186 */
{ 96000, 95982, 2, 172 }, /* i2sdiv: 3, odd: 1, rate error % (desired vs actual)%: 0.0186 */
};
#define BARRIER do { __asm__ volatile("" ::: "memory"); } while (0)
#define BINARY(I) do { \
base = ((base)[I].freq <= key)?base+I:base; \
BARRIER; \
} while (0)
static i2s_pll_entry_t const *i2s_find_pll_params( uint32_t key ) {
i2s_pll_entry_t const* base = i2s_pll_table;
BINARY(5);
BINARY(2);
BINARY(1);
BINARY(1);
return base;
}
/** /**
* @} * @}
*/ */
@ -274,6 +311,7 @@ uint8_t BSP_AUDIO_OUT_Play(uint16_t* pBuffer, uint32_t Size)
} }
else else
{ {
bsp_audio_out_frequency = bsp_audio_out_actual_frequency;
/* Update the Media layer and enable it for play */ /* Update the Media layer and enable it for play */
HAL_I2S_Transmit_DMA(&hAudioOutI2s, pBuffer, DMA_MAX(Size/AUDIODATA_SIZE)); HAL_I2S_Transmit_DMA(&hAudioOutI2s, pBuffer, DMA_MAX(Size/AUDIODATA_SIZE));
@ -352,7 +390,9 @@ uint8_t BSP_AUDIO_OUT_Stop(uint32_t Option)
{ {
/* Call DMA Stop to disable DMA stream before stopping codec */ /* Call DMA Stop to disable DMA stream before stopping codec */
HAL_I2S_DMAStop(&hAudioOutI2s); HAL_I2S_DMAStop(&hAudioOutI2s);
bsp_audio_out_frequency = 0;
/* Call Audio Codec Stop function */ /* Call Audio Codec Stop function */
if(pAudioDrv->Stop(AUDIO_I2C_ADDRESS, Option) != 0) if(pAudioDrv->Stop(AUDIO_I2C_ADDRESS, Option) != 0)
{ {
@ -444,9 +484,9 @@ uint8_t BSP_AUDIO_OUT_SetOutputMode(uint8_t Output)
*/ */
void BSP_AUDIO_OUT_SetFrequency(uint32_t AudioFreq) void BSP_AUDIO_OUT_SetFrequency(uint32_t AudioFreq)
{ {
/* PLL clock is set depending by the AudioFreq (44.1khz vs 48khz groups) */ /* PLL clock is set depending by the AudioFreq (44.1khz vs 48khz groups) */
BSP_AUDIO_OUT_ClockConfig(&hAudioOutI2s, AudioFreq, NULL); BSP_AUDIO_OUT_ClockConfig(&hAudioOutI2s, AudioFreq, NULL);
/* Update the I2S audio frequency configuration */ /* Update the I2S audio frequency configuration */
I2S3_Init(AudioFreq); I2S3_Init(AudioFreq);
} }
@ -487,42 +527,24 @@ void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s)
* @param Params : pointer on additional configuration parameters, can be NULL. * @param Params : pointer on additional configuration parameters, can be NULL.
*/ */
__weak void BSP_AUDIO_OUT_ClockConfig(I2S_HandleTypeDef *hi2s, uint32_t AudioFreq, void *Params) __weak void BSP_AUDIO_OUT_ClockConfig(I2S_HandleTypeDef *hi2s, uint32_t AudioFreq, void *Params)
{ {
RCC_PeriphCLKInitTypeDef rccclkinit; RCC_PeriphCLKInitTypeDef rccclkinit;
uint8_t index = 0, freqindex = 0xFF;
i2s_pll_entry_t const *pll_params = i2s_find_pll_params( AudioFreq );
for(index = 0; index < 8; index++)
{ bsp_audio_out_actual_frequency = pll_params->actual;
if(I2SFreq[index] == AudioFreq)
{
freqindex = index;
}
}
/* Enable PLLI2S clock */ /* Enable PLLI2S clock */
HAL_RCCEx_GetPeriphCLKConfig(&rccclkinit); HAL_RCCEx_GetPeriphCLKConfig(&rccclkinit);
/* PLLI2S_VCO Input = HSE_VALUE/PLL_M = 1 Mhz */ /* PLLI2S_VCO Input = HSE_VALUE/PLL_M */
// BK use table if frequency found in table, otherwise use same settings as for 48 kHz /* I2S clock config
if (freqindex != 0xFF) PLLI2S_VCO = f(VCO clock) = f(PLLI2S clock input) <EFBFBD> (PLLI2SN/PLLM)
{ I2SCLK = f(PLLI2S clock output) = f(VCO clock) / PLLI2SR */
/* I2S clock config rccclkinit.PeriphClockSelection = RCC_PERIPHCLK_I2S;
PLLI2S_VCO = f(VCO clock) = f(PLLI2S clock input) <EFBFBD> (PLLI2SN/PLLM) rccclkinit.PLLI2S.PLLI2SN = pll_params->n;
I2SCLK = f(PLLI2S clock output) = f(VCO clock) / PLLI2SR */ rccclkinit.PLLI2S.PLLI2SR = pll_params->r;
rccclkinit.PeriphClockSelection = RCC_PERIPHCLK_I2S; HAL_RCCEx_PeriphCLKConfig(&rccclkinit);
rccclkinit.PLLI2S.PLLI2SN = I2SPLLN[freqindex];
rccclkinit.PLLI2S.PLLI2SR = I2SPLLR[freqindex];
HAL_RCCEx_PeriphCLKConfig(&rccclkinit);
}
else
{
/* I2S clock config
PLLI2S_VCO = f(VCO clock) = f(PLLI2S clock input) <EFBFBD> (PLLI2SN/PLLM)
I2SCLK = f(PLLI2S clock output) = f(VCO clock) / PLLI2SR */
rccclkinit.PeriphClockSelection = RCC_PERIPHCLK_I2S;
rccclkinit.PLLI2S.PLLI2SN = 258;
rccclkinit.PLLI2S.PLLI2SR = 3;
HAL_RCCEx_PeriphCLKConfig(&rccclkinit);
}
} }
/** /**
@ -874,6 +896,17 @@ void HAL_I2S_RxHalfCpltCallback(I2S_HandleTypeDef *hi2s)
BSP_AUDIO_IN_HalfTransfer_CallBack(); BSP_AUDIO_IN_HalfTransfer_CallBack();
} }
/**
* @brief Retrive the audio frequency.
* @ret AudioFreq: Audio frequency used to play the audio stream.
* @note This API should be called after the BSP_AUDIO_OUT_Init() to adjust the
* audio frequency.
*/
uint32_t BSP_AUDIO_OUT_GetFrequency(uint32_t AudioFreq)
{
return bsp_audio_out_frequency;
}
/** /**
* @brief Audio In Clock Config. * @brief Audio In Clock Config.
* @param hi2s: I2S handle * @param hi2s: I2S handle
@ -888,27 +921,13 @@ __weak void BSP_AUDIO_IN_ClockConfig(I2S_HandleTypeDef *hi2s, uint32_t AudioFreq
/*Enable PLLI2S clock*/ /*Enable PLLI2S clock*/
HAL_RCCEx_GetPeriphCLKConfig(&rccclkinit); HAL_RCCEx_GetPeriphCLKConfig(&rccclkinit);
/* PLLI2S_VCO Input = HSE_VALUE/PLL_M = 1 Mhz */
if ((AudioFreq & 0x7) == 0) i2s_pll_entry_t const *pll_params = i2s_find_pll_params( AudioFreq );
{
/* Audio frequency multiple of 8 (8/16/32/48/96/192)*/ rccclkinit.PeriphClockSelection = RCC_PERIPHCLK_I2S;
/* PLLI2S_VCO Output = PLLI2S_VCO Input * PLLI2SN = 192 Mhz */ rccclkinit.PLLI2S.PLLI2SN = pll_params->n;
/* I2SCLK = PLLI2S_VCO Output/PLLI2SR = 192/6 = 32 Mhz */ rccclkinit.PLLI2S.PLLI2SR = pll_params->r;
rccclkinit.PeriphClockSelection = RCC_PERIPHCLK_I2S; HAL_RCCEx_PeriphCLKConfig(&rccclkinit);
rccclkinit.PLLI2S.PLLI2SN = 192;
rccclkinit.PLLI2S.PLLI2SR = 6;
HAL_RCCEx_PeriphCLKConfig(&rccclkinit);
}
else
{
/* Other Frequency (11.025/22.500/44.100) */
/* PLLI2S_VCO Output = PLLI2S_VCO Input * PLLI2SN = 290 Mhz */
/* I2SCLK = PLLI2S_VCO Output/PLLI2SR = 290/2 = 145 Mhz */
rccclkinit.PeriphClockSelection = RCC_PERIPHCLK_I2S;
rccclkinit.PLLI2S.PLLI2SN = 290;
rccclkinit.PLLI2S.PLLI2SR = 2;
HAL_RCCEx_PeriphCLKConfig(&rccclkinit);
}
} }
/** /**