chip: update i2s driver

Author: redchenjs

main/Kconfig.projbuild

@@ -190,9 +190,24 @@ config ENABLE_AUDIO_PROMPT
     help
         Select this to enable audio prompt.
 
+choice AUDIO_OUTPUT
+    prompt "Audio Output"
+    default AUDIO_OUTPUT_I2S1
+    depends on ENABLE_AUDIO_PROMPT
+    help
+        Select Audio Output Interface.
+
+    config AUDIO_OUTPUT_I2S0
+        bool "I2S-0"
+    config AUDIO_OUTPUT_I2S1
+        bool "I2S-1"
+endchoice
+
 config AUDIO_OUTPUT_I2S_NUM
     int
-    default 0
+    default 0 if AUDIO_OUTPUT_I2S0
+    default 1 if AUDIO_OUTPUT_I2S1
+    depends on ENABLE_AUDIO_PROMPT
 
 config I2S_BCLK_PIN
     int "I2S BCLK Pin"

main/inc/chip/i2s.h

@@ -8,7 +8,8 @@
 #ifndef INC_CHIP_I2S_H_
 #define INC_CHIP_I2S_H_
 
-extern void i2s0_init(void);
+extern void i2s_output_init(void);
+extern void i2s_output_deinit(void);
 
 extern void i2s_output_set_sample_rate(int rate);
 

main/src/app_main.c

@@ -40,7 +40,7 @@ static void chip_init(void)
     uart1_init();
 
 #ifdef CONFIG_ENABLE_AUDIO_PROMPT
-    i2s0_init();
+    i2s_output_init();
 #endif
 
 #ifdef CONFIG_ENABLE_GUI
@@ -83,6 +83,7 @@ int app_main(void)
     core_init();
 
     chip_init();
+
     board_init();
 
     user_init();

main/src/chip/i2s.c

@@ -11,6 +11,7 @@
 #include "driver/i2s.h"
 
 #define I2S0_TAG "i2s-0"
+#define I2S1_TAG "i2s-1"
 
 #ifdef CONFIG_ENABLE_AUDIO_PROMPT
 static i2s_config_t i2s_output_config = {
@@ -25,8 +26,10 @@ static i2s_config_t i2s_output_config = {
     .dma_buf_len = 128,
     .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,                           // 2-channels
 };
+#endif
 
-void i2s0_init(void)
+#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == 0)
+static void i2s0_init(void)
 {
     ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_0, &i2s_output_config, 0, NULL));
 
@@ -46,12 +49,68 @@ void i2s0_init(void)
     );
 }
 
+static void i2s0_deinit(void)
+{
+    ESP_ERROR_CHECK(i2s_driver_uninstall(I2S_NUM_0));
+
+    ESP_LOGI(I2S0_TAG, "deinitialized.");
+}
+#endif
+
+#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == 1)
+static void i2s1_init(void)
+{
+    ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_1, &i2s_output_config, 0, NULL));
+
+    i2s_pin_config_t pin_config = {
+        .bck_io_num   = CONFIG_I2S_BCLK_PIN,
+        .ws_io_num    = CONFIG_I2S_LRCK_PIN,
+        .data_out_num = CONFIG_I2S_DOUT_PIN,
+        .data_in_num  = -1,                                                 // Not used
+    };
+    ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM_1, &pin_config));
+
+    ESP_LOGI(I2S1_TAG, "initialized, bck: %d, ws: %d, dout: %d, din: %d",
+             pin_config.bck_io_num,
+             pin_config.ws_io_num,
+             pin_config.data_out_num,
+             pin_config.data_in_num
+    );
+}
+
+static void i2s1_deinit(void)
+{
+    ESP_ERROR_CHECK(i2s_driver_uninstall(I2S_NUM_1));
+
+    ESP_LOGI(I2S1_TAG, "deinitialized.");
+}
+#endif
+
+#ifdef CONFIG_ENABLE_AUDIO_PROMPT
+void i2s_output_init(void)
+{
+#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == 0)
+    i2s0_init();
+#else
+    i2s1_init();
+#endif
+}
+
+void i2s_output_deinit(void)
+{
+#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == 0)
+    i2s0_deinit();
+#else
+    i2s1_deinit();
+#endif
+}
+
 void i2s_output_set_sample_rate(int rate)
 {
     if (rate != i2s_output_config.sample_rate) {
         i2s_output_config.sample_rate = rate;
-        i2s_zero_dma_buffer(0);
-        i2s_set_sample_rates(0, i2s_output_config.sample_rate);
+        i2s_zero_dma_buffer(CONFIG_AUDIO_OUTPUT_I2S_NUM);
+        i2s_set_sample_rates(CONFIG_AUDIO_OUTPUT_I2S_NUM, i2s_output_config.sample_rate);
     }
 }
 #endif

main/src/user/audio_player.c

@@ -31,6 +31,7 @@ static const char *mp3_file_ptr[][2] = {
     {snd6_mp3_ptr, snd6_mp3_end}, // "系统故障"
     {snd7_mp3_ptr, snd7_mp3_end}, // "开始配网"
 };
+
 static uint8_t mp3_file_index   = 0;
 static uint8_t playback_pending = 0;
 

main/src/user/audio_render.c

@@ -28,7 +28,7 @@ void render_sample_block(short *sample_buff_ch0, short *sample_buff_ch1, int num
     for (int i = 0; i < num_samples; i++) {
         /* low - high / low - high */
         const char samp32[4] = {ptr_l[0], ptr_l[1], ptr_r[0], ptr_r[1]}; // ESP32 CPU is Little Endian
-        i2s_write(0, (const char *)&samp32, sizeof(samp32), &bytes_written, portMAX_DELAY);
+        i2s_write(CONFIG_AUDIO_OUTPUT_I2S_NUM, (const char *)&samp32, sizeof(samp32), &bytes_written, portMAX_DELAY);
 
         // DMA buffer full - retry
         if (bytes_written == 0) {