added Mic Management

Author: alfran

cores/arduino/BSP/OTTO/otto_audio_inout.c

@@ -123,7 +123,7 @@ AUDIO_DrvTypeDef          *audio_drv;
 SAI_HandleTypeDef         haudio_out_sai;
 SAI_HandleTypeDef         haudio_in_sai;
 uint16_t __IO AudioInVolume = DEFAULT_AUDIO_IN_VOLUME;
-
+ 
 /**
   * @}
   */
@@ -170,7 +170,6 @@ uint8_t BSP_AUDIO_OUT_Init(uint16_t OutputDevice, uint8_t Volume, uint32_t Audio
 {
   uint8_t ret = AUDIO_ERROR;
   uint32_t deviceid = 0x00;
-  uint8_t buffer_fake[32] = {0x00};
 
   SAIx_DeInit();
 
@@ -207,11 +206,8 @@ uint8_t BSP_AUDIO_OUT_Init(uint16_t OutputDevice, uint8_t Volume, uint32_t Audio
     /* Resets the audio codec. */
     audio_drv->Reset(AUDIO_I2C_ADDRESS);
 
-    HAL_SAI_Transmit_DMA(&haudio_out_sai, buffer_fake, 32);
-
     /* Initialize the codec internal registers */
     audio_drv->Init(AUDIO_I2C_ADDRESS, OutputDevice, Volume, AudioFreq);
-  HAL_SAI_DMAStop(&haudio_out_sai);
   }
 
 
@@ -471,7 +467,22 @@ void HAL_SAI_TxHalfCpltCallback(SAI_HandleTypeDef *hsai)
   */
 void HAL_SAI_ErrorCallback(SAI_HandleTypeDef *hsai)
 {
-  BSP_AUDIO_OUT_Error_CallBack();
+  HAL_SAI_StateTypeDef audio_out_state;
+  HAL_SAI_StateTypeDef audio_in_state;
+
+  audio_out_state = HAL_SAI_GetState(&haudio_out_sai);
+  audio_in_state = HAL_SAI_GetState(&haudio_in_sai);
+
+  /* Determines if it is an audio out or audio in error */
+  if ((audio_out_state == HAL_SAI_STATE_BUSY) || (audio_out_state == HAL_SAI_STATE_BUSY_TX))
+  {
+    BSP_AUDIO_OUT_Error_CallBack();
+  }
+
+  if ((audio_in_state == HAL_SAI_STATE_BUSY) || (audio_in_state == HAL_SAI_STATE_BUSY_RX))
+  {
+    BSP_AUDIO_IN_Error_CallBack();
+  }
 }
 
 /**
@@ -749,8 +760,7 @@ uint8_t BSP_AUDIO_IN_Init(uint16_t InputDevice, uint8_t Volume, uint32_t AudioFr
   uint8_t ret = AUDIO_ERROR;
   uint32_t deviceid = 0x00;
   uint32_t slot_active;
-  uint8_t buffer_fake[32] = {0x00};
-  /* Only MICROPHONE_2 input supported */
+   /* Only MICROPHONE_2 input supported */
   if (InputDevice != INPUT_DEVICE_DIGITAL_MICROPHONE_2)
   {
     ret = AUDIO_ERROR;
@@ -805,7 +815,6 @@ uint8_t BSP_AUDIO_IN_Init(uint16_t InputDevice, uint8_t Volume, uint32_t AudioFr
       /* Reset the Codec Registers */
       wm8994_drv.Reset(AUDIO_I2C_ADDRESS);
 
-      HAL_SAI_Receive_DMA(&haudio_in_sai, buffer_fake, 32);
       /* Initialize the audio driver structure */
       audio_drv = &wm8994_drv;
       ret = AUDIO_OK;
@@ -973,7 +982,7 @@ __weak void BSP_AUDIO_IN_HalfTransfer_CallBack(void)
 /**
   * @brief  Audio IN Error callback function.
   */
-__weak void BSP_AUDIO_IN_Error_Callback(void)
+__weak void BSP_AUDIO_IN_Error_CallBack(void)
 {
   /* This function is called when an Interrupt due to transfer error on or peripheral
      error occurs. */
@@ -1015,6 +1024,9 @@ __weak void BSP_AUDIO_IN_MspInit(SAI_HandleTypeDef *hsai, void *Params)
   /* Enable the DMA clock */
   AUDIO_IN_SAIx_DMAx_CLK_ENABLE();
 
+  /*  arduino internal driver init - somehow redundant with above */
+  dma_init(DMA2);
+
   if(hsai->Instance == AUDIO_IN_SAIx)
   {
     /* Configure the hdma_sai_rx handle parameters */
@@ -1045,6 +1057,8 @@ __weak void BSP_AUDIO_IN_MspInit(SAI_HandleTypeDef *hsai, void *Params)
 
   /* SAI DMA IRQ Channel configuration */
   HAL_NVIC_SetPriority(AUDIO_IN_SAIx_DMAx_IRQ, AUDIO_IN_IRQ_PREPRIO, 0);
+  /* Register also the IRQ in arduino DMA driver so that correct handler is called */
+  dma_attach_interrupt(DMA2, DMA_STREAM3, BSP_AUDIO_IN_DMA2_Stream3_IRQHandler);
   HAL_NVIC_EnableIRQ(AUDIO_IN_SAIx_DMAx_IRQ);
 
   /* Audio INT IRQ Channel configuration */
@@ -1176,7 +1190,7 @@ static void SAIx_In_Init(uint32_t SaiOutMode, uint32_t SlotActive, uint32_t Audi
   /* Configure SAI_Block_x Frame
   Frame Length: 64
   Frame active Length: 32
-  FS Definition: Start frame  Channel Side identification
+  FS Definition: Start frame + Channel Side identification
   FS Polarity: FS active Low
   FS Offset: FS asserted one bit before the first bit of slot 0 */
   haudio_in_sai.FrameInit.FrameLength = 64;

cores/arduino/BSP/OTTO/otto_audio_inout.h

@@ -101,40 +101,6 @@
 #define AUDIO_SAIx_DMAx_MEM_DATA_SIZE        DMA_MDATAALIGN_HALFWORD
 #define DMA_MAX_SZE                          0xFFFF
 
-#define AUDIO_SAIx_DMAx_IRQHandler           DMA2_Stream5_IRQHandler
-
-///* SAI peripheral configuration defines */
-//#define AUDIO_SAIx                           HAL_SAI1_Block_A
-//#define AUDIO_SAIx_CLK_ENABLE()              __HAL_RCC_SAI1_CLK_ENABLE()
-//#define AUDIO_SAIx_CLK_DISABLE()             __HAL_RCC_SAI1_CLK_DISABLE()
-//#define AUDIO_SAIx_MCLK_SCK_SD_FS_AF         GPIO_AF6_SAI1
-//
-//#define AUDIO_SAIx_MCLK_ENABLE()             __HAL_RCC_GPIOG_CLK_ENABLE()
-//#define AUDIO_SAIx_MCLK_DISABLE()            __HAL_RCC_GPIOG_CLK_DISABLE()
-//
-//#define AUDIO_SAIx_MCK_PIN                   GPIO_PIN_7
-//#define AUDIO_SAIx_MCLK_GPIO_PORT            HAL_GPIOG
-//
-//#define AUDIO_SAIx_SCK_SD_FS_ENABLE()        __HAL_RCC_GPIOE_CLK_ENABLE()
-//#define AUDIO_SAIx_SCK_SD_FS_DISABLE()       __HAL_RCC_GPIOE_CLK_DISABLE()
-//#define AUDIO_SAIx_FS_PIN                    GPIO_PIN_4
-//#define AUDIO_SAIx_SCK_PIN                   GPIO_PIN_5
-//#define AUDIO_SAIx_SD_PIN                    GPIO_PIN_6
-//#define AUDIO_SAIx_SCK_SD_FS_GPIO_PORT       HAL_GPIOE
-//
-//
-///* SAI DMA Stream definitions */
-//#define AUDIO_SAIx_DMAx_CLK_ENABLE()         __HAL_RCC_DMA2_CLK_ENABLE()
-//#define AUDIO_SAIx_DMAx_CLK_DISABLE()        __HAL_RCC_DMA2_CLK_DISABLE()
-//#define AUDIO_SAIx_DMAx_STREAM               HAL_DMA2_Stream3
-//#define AUDIO_SAIx_DMAx_CHANNEL              DMA_CHANNEL_0
-//#define AUDIO_SAIx_DMAx_IRQ                  DMA2_Stream3_IRQn
-//#define AUDIO_SAIx_DMAx_PERIPH_DATA_SIZE     DMA_PDATAALIGN_HALFWORD
-//#define AUDIO_SAIx_DMAx_MEM_DATA_SIZE        DMA_MDATAALIGN_HALFWORD
-//#define DMA_MAX_SZE                          0xFFFF
-//
-//#define AUDIO_SAIx_DMAx_IRQHandler           DMA2_Stream3_IRQHandler
-
 /* Select the interrupt preemption priority for the DMA interrupt */
 #define AUDIO_OUT_IRQ_PREPRIO           5   /* Select the preemption priority level(0 is the highest) */
 
@@ -158,14 +124,12 @@
 
 /* SAI DMA Stream definitions */
 #define AUDIO_IN_SAIx_DMAx_CLK_ENABLE()          __HAL_RCC_DMA2_CLK_ENABLE()
-#define AUDIO_IN_SAIx_DMAx_STREAM                HAL_DMA2_Stream1
+#define AUDIO_IN_SAIx_DMAx_STREAM                HAL_DMA2_Stream3
 #define AUDIO_IN_SAIx_DMAx_CHANNEL               DMA_CHANNEL_0
-#define AUDIO_IN_SAIx_DMAx_IRQ                   DMA2_Stream1_IRQn
+#define AUDIO_IN_SAIx_DMAx_IRQ                   DMA2_Stream3_IRQn
 #define AUDIO_IN_SAIx_DMAx_PERIPH_DATA_SIZE      DMA_PDATAALIGN_HALFWORD
 #define AUDIO_IN_SAIx_DMAx_MEM_DATA_SIZE         DMA_MDATAALIGN_HALFWORD
 
-#define AUDIO_IN_SAIx_DMAx_IRQHandler            DMA2_Stream1_IRQHandler
-#define AUDIO_IN_INT_IRQHandler                  EXTI9_5_IRQHandler
 
 /* Select the interrupt preemption priority and subpriority for the IT/DMA interrupt */
 #define AUDIO_IN_IRQ_PREPRIO                ((uint32_t)6)   /* Select the preemption priority level(0 is the highest) */
@@ -298,14 +262,15 @@ void    BSP_AUDIO_IN_HalfTransfer_CallBack(void);
 
 /* This function is called when an Interrupt due to transfer error on or peripheral
    error occurs. */
-void    BSP_AUDIO_IN_Error_Callback(void);
+void    BSP_AUDIO_IN_Error_CallBack(void);
 
 /* These function can be modified in case the current settings (e.g. DMA stream)
    need to be changed for specific application needs */
 void BSP_AUDIO_IN_ClockConfig(SAI_HandleTypeDef *hsai, uint32_t AudioFreq, void *Params);
 void BSP_AUDIO_IN_MspInit(SAI_HandleTypeDef *hsai, void *Params);
 void BSP_AUDIO_IN_MspDeInit(SAI_HandleTypeDef *hsai, void *Params);
 
+
 /**
   * @}
   */