Diff: STM32H747I-Discovery/stm32h747i_discovery_audio.c

Revision:

2:53134782cc12

Parent:

1:9716849a8de8

--- a/STM32H747I-Discovery/stm32h747i_discovery_audio.c	Wed Sep 25 17:50:02 2019 +0200
+++ b/STM32H747I-Discovery/stm32h747i_discovery_audio.c	Wed Nov 06 10:14:54 2019 +0100
@@ -115,7 +115,6 @@
   */
 /* Includes ------------------------------------------------------------------*/
 #include "stm32h747i_discovery_audio.h"
-#include "mbed_assert.h"
 
 /** @addtogroup BSP
   * @{
@@ -148,8 +147,8 @@
 __IO uint16_t                   AudioInVolume = DEFAULT_AUDIO_IN_VOLUME;
 
 /* PDM filters params */
-// PDM_Filter_Handler_t  PDM_FilterHandler[2];
-// PDM_Filter_Config_t   PDM_FilterConfig[2];
+PDM_Filter_Handler_t  PDM_FilterHandler[2];
+PDM_Filter_Config_t   PDM_FilterConfig[2];
 
 /**
   * @}
@@ -1107,7 +1106,6 @@
 uint8_t BSP_AUDIO_IN_PDMToPCM_Init(uint32_t AudioFreq, uint32_t ChnlNbrIn, uint32_t ChnlNbrOut)
 {
   uint32_t index = 0;
-  MBED_ASSERT(0);
 
   /* Enable CRC peripheral to unlock the PDM library */
   __HAL_RCC_CRC_CLK_ENABLE();
@@ -1115,18 +1113,18 @@
   for(index = 0; index < ChnlNbrIn; index++)
   {
     /* Init PDM filters */
-    // PDM_FilterHandler[index].bit_order  = PDM_FILTER_BIT_ORDER_MSB;
-    // PDM_FilterHandler[index].endianness = PDM_FILTER_ENDIANNESS_LE;
-    // PDM_FilterHandler[index].high_pass_tap = 2122358088;
-    // PDM_FilterHandler[index].out_ptr_channels = ChnlNbrOut;
-    // PDM_FilterHandler[index].in_ptr_channels  = ChnlNbrIn;
-    // PDM_Filter_Init((PDM_Filter_Handler_t *)(&PDM_FilterHandler[index]));
-    
+    PDM_FilterHandler[index].bit_order  = PDM_FILTER_BIT_ORDER_MSB;
+    PDM_FilterHandler[index].endianness = PDM_FILTER_ENDIANNESS_LE;
+    PDM_FilterHandler[index].high_pass_tap = 2122358088;
+    PDM_FilterHandler[index].out_ptr_channels = ChnlNbrOut;
+    PDM_FilterHandler[index].in_ptr_channels  = ChnlNbrIn;
+    PDM_Filter_Init((PDM_Filter_Handler_t *)(&PDM_FilterHandler[index]));
+
     /* PDM lib config phase */
-    // PDM_FilterConfig[index].output_samples_number = AudioFreq/1000;
-    // PDM_FilterConfig[index].mic_gain = 24;
-    // PDM_FilterConfig[index].decimation_factor = PDM_FILTER_DEC_FACTOR_64;
-    // PDM_Filter_setConfig((PDM_Filter_Handler_t *)&PDM_FilterHandler[index], &PDM_FilterConfig[index]);
+    PDM_FilterConfig[index].output_samples_number = AudioFreq/1000;
+    PDM_FilterConfig[index].mic_gain = 24;
+    PDM_FilterConfig[index].decimation_factor = PDM_FILTER_DEC_FACTOR_64;
+    PDM_Filter_setConfig((PDM_Filter_Handler_t *)&PDM_FilterHandler[index], &PDM_FilterConfig[index]);
   }
 
   return AUDIO_OK;
@@ -1143,11 +1141,10 @@
 uint8_t BSP_AUDIO_IN_PDMToPCM(uint16_t *PDMBuf, uint16_t *PCMBuf)
 {
   uint32_t index = 0;
-  MBED_ASSERT(0);
 
   for(index = 0; index < hAudioIn.ChannelNbr; index++)
   {
-    // PDM_Filter(&((uint8_t*)(PDMBuf))[index], (uint16_t*)&(PCMBuf[index]), &PDM_FilterHandler[index]);
+    PDM_Filter(&((uint8_t*)(PDMBuf))[index], (uint16_t*)&(PCMBuf[index]), &PDM_FilterHandler[index]);
   }
 
   return AUDIO_OK;