Separate components better and remove audio_board dependencies (#110)

* Remove audio board dependency from lightsnapcast.

* Move dac settings (i2c communication) to main task. Remove audio_board dependency from http_get_task

* Remove unneeded dependencies from dsp_processor component.

components/dsp_processor/CMakeLists.txt

@@ -1,10 +1,6 @@
 set(COMPONENT_REQUIRES)
-set(COMPONENT_PRIV_REQUIRES audio_board audio_sal audio_hal esp-dsp)
+set(COMPONENT_PRIV_REQUIRES esp-dsp)
 
 list(APPEND COMPONENT_ADD_INCLUDEDIRS ./include)
 set(COMPONENT_SRCS ./dsp_processor.c)
 register_component()
-
-# IDF >=4
-idf_component_get_property(audio_board_lib audio_board COMPONENT_LIB)
-set_property(TARGET ${audio_board_lib} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${COMPONENT_LIB})

components/lightsnapcast/CMakeLists.txt

@@ -1,3 +1,3 @@
 idf_component_register(SRCS "snapcast.c" "player.c"
                        INCLUDE_DIRS "include"
-                       REQUIRES custom_board libbuffer json libmedian audio_board esp_wifi driver esp_timer)
+                       REQUIRES libbuffer json libmedian esp_wifi driver esp_timer)

components/lightsnapcast/include/player.h

@@ -63,7 +63,7 @@ typedef struct snapcastSetting_s {
   uint32_t pcmBufSize;
 } snapcastSetting_t;
 
-int init_player(void);
+int init_player(i2s_std_gpio_config_t pin_config0_, i2s_port_t i2sNum_);
 int deinit_player(void);
 
 int32_t allocate_pcm_chunk_memory(pcm_chunk_message_t **pcmChunk, size_t bytes);

components/lightsnapcast/player.c

@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include "MedianFilter.h"
-#include "board_pins_config.h"
 #include "driver/gptimer.h"
 #include "driver/i2s_std.h"
 #include "player.h"
@@ -99,11 +98,14 @@ static bool gpTimerRunning = false;
 
 static void player_task(void *pvParameters);
 
-extern esp_err_t audio_set_mute(bool mute);
+extern void audio_set_mute(bool mute);
 
 static i2s_chan_handle_t tx_chan = NULL;  // I2S tx channel handler
 static bool i2sEnabled = false;
 
+i2s_std_gpio_config_t pin_config0;
+i2s_port_t i2sNum;
+
 /**
  *
  */
@@ -137,8 +139,7 @@ esp_err_t my_i2s_channel_enable(i2s_chan_handle_t handle) {
 /**
  *
  */
-static esp_err_t player_setup_i2s(i2s_port_t i2sNum,
-                                  snapcastSetting_t *setting) {
+static esp_err_t player_setup_i2s(snapcastSetting_t *setting) {
   // ensure save setting
   int32_t sr = setting->sr;
   if (sr == 0) {
@@ -235,8 +236,6 @@ static esp_err_t player_setup_i2s(i2s_port_t i2sNum,
   };
   ESP_ERROR_CHECK(i2s_new_channel(&tx_chan_cfg, &tx_chan, NULL));
 
-  board_i2s_pin_t pin_config0;
-  get_i2s_pins(i2sNum, &pin_config0);
 
   ESP_LOGI(TAG,
            "player_setup_i2s: dma_buf_len is %ld, dma_buf_count is %ld, sample "
@@ -261,35 +260,7 @@ static esp_err_t player_setup_i2s(i2s_port_t i2sNum,
       .slot_cfg =
           I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(bits, I2S_SLOT_MODE_STEREO),
 #endif
-      .gpio_cfg =
-          {
-              .mclk = pin_config0.mck_io_num,
-              .bclk = pin_config0.bck_io_num,
-              .ws = pin_config0.ws_io_num,
-              .dout = pin_config0.data_out_num,
-              .din = pin_config0.data_in_num,
-              .invert_flags =
-                  {
-#if CONFIG_INVERT_MCLK_LEVEL
-                      .mclk_inv = true,
-
-#else
-                      .mclk_inv = false,
-#endif
-
-#if CONFIG_INVERT_BCLK_LEVEL
-                      .bclk_inv = true,
-#else
-                      .bclk_inv = false,
-#endif
-
-#if CONFIG_INVERT_WORD_SELECT_LEVEL
-                      .ws_inv = true,
-#else
-                      .ws_inv = false,
-#endif
-                  },
-          },
+      .gpio_cfg = pin_config0,
   };
 
   ESP_ERROR_CHECK(i2s_channel_init_std_mode(tx_chan, &tx_std_cfg));
@@ -368,11 +339,14 @@ int deinit_player(void) {
 /**
  *  call before http task creation!
  */
-int init_player(void) {
+int init_player(i2s_std_gpio_config_t pin_config0_, i2s_port_t i2sNum_) {
   int ret = 0;
 
   deinit_player();
 
+  pin_config0 = pin_config0_;
+  i2sNum = i2sNum_;
+
   currentSnapcastSetting.buf_ms = 0;
   currentSnapcastSetting.chkInFrames = 0;
   currentSnapcastSetting.codec = NONE;
@@ -387,7 +361,7 @@ int init_player(void) {
     xSemaphoreGive(snapcastSettingsMux);
   }
 
-  ret = player_setup_i2s(I2S_NUM_0, &currentSnapcastSetting);
+  ret = player_setup_i2s(&currentSnapcastSetting);
   if (ret < 0) {
     ESP_LOGE(TAG, "player_setup_i2s failed: %d", ret);
 
@@ -1225,7 +1199,7 @@ static void player_task(void *pvParameters) {
           audio_set_mute(true);
           my_i2s_channel_disable(tx_chan);
 
-          ret = player_setup_i2s(I2S_NUM_0, &__scSet);
+          ret = player_setup_i2s(&__scSet);
           if (ret < 0) {
             ESP_LOGE(TAG, "player_setup_i2s failed: %d", ret);