Merge pull request #111 from Y1hsiaochunnn/master

Fix known bugs

Author: Y1hsiaochunnn

bsp/esp32_p4_wifi6_touch_lcd_7b/esp32_p4_wifi6_touch_lcd_7b.c

@@ -42,6 +42,7 @@ static i2c_master_bus_handle_t i2c_handle = NULL; // I2C Handle
 static i2s_chan_handle_t i2s_tx_chan = NULL;
 static i2s_chan_handle_t i2s_rx_chan = NULL;
 static const audio_codec_data_if_t *i2s_data_if = NULL; /* Codec data interface */
+#define BSP_ES7210_CODEC_ADDR ES7210_CODEC_DEFAULT_ADDR
 
 /* Can be used for `i2s_std_gpio_config_t` and/or `i2s_std_config_t` initialization */
 #define BSP_I2S_GPIO_CFG       \
@@ -188,6 +189,7 @@ esp_err_t bsp_spiffs_unmount(void)
 
 esp_err_t bsp_audio_init(const i2s_std_config_t *i2s_config)
 {
+    esp_err_t ret = ESP_FAIL;
     if (i2s_tx_chan && i2s_rx_chan)
     {
         /* Audio was initialized before */
@@ -197,7 +199,7 @@ esp_err_t bsp_audio_init(const i2s_std_config_t *i2s_config)
     /* Setup I2S peripheral */
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(CONFIG_BSP_I2S_NUM, I2S_ROLE_MASTER);
     chan_cfg.auto_clear = true; // Auto clear the legacy data in the DMA buffer
-    ESP_ERROR_CHECK(i2s_new_channel(&chan_cfg, &i2s_tx_chan, &i2s_rx_chan));
+    BSP_ERROR_CHECK_RETURN_ERR(i2s_new_channel(&chan_cfg, &i2s_tx_chan, &i2s_rx_chan));
 
     /* Setup I2S channels */
     const i2s_std_config_t std_cfg_default = BSP_I2S_DUPLEX_MONO_CFG(22050);
@@ -209,34 +211,46 @@ esp_err_t bsp_audio_init(const i2s_std_config_t *i2s_config)
 
     if (i2s_tx_chan != NULL)
     {
-        ESP_ERROR_CHECK(i2s_channel_init_std_mode(i2s_tx_chan, p_i2s_cfg));
-        ESP_ERROR_CHECK(i2s_channel_enable(i2s_tx_chan));
+        ESP_GOTO_ON_ERROR(i2s_channel_init_std_mode(i2s_tx_chan, p_i2s_cfg), err, TAG, "I2S channel initialization failed");
+        ESP_GOTO_ON_ERROR(i2s_channel_enable(i2s_tx_chan), err, TAG, "I2S enabling failed");
     }
-
     if (i2s_rx_chan != NULL)
     {
-        ESP_ERROR_CHECK(i2s_channel_init_std_mode(i2s_rx_chan, p_i2s_cfg));
-        ESP_ERROR_CHECK(i2s_channel_enable(i2s_rx_chan));
+        ESP_GOTO_ON_ERROR(i2s_channel_init_std_mode(i2s_rx_chan, p_i2s_cfg), err, TAG, "I2S channel initialization failed");
+        ESP_GOTO_ON_ERROR(i2s_channel_enable(i2s_rx_chan), err, TAG, "I2S enabling failed");
     }
 
     audio_codec_i2s_cfg_t i2s_cfg = {
         .port = CONFIG_BSP_I2S_NUM,
-        .tx_handle = i2s_tx_chan,
         .rx_handle = i2s_rx_chan,
+        .tx_handle = i2s_tx_chan,
     };
     i2s_data_if = audio_codec_new_i2s_data(&i2s_cfg);
+    BSP_NULL_CHECK_GOTO(i2s_data_if, err);
 
     return ESP_OK;
+
+err:
+    if (i2s_tx_chan)
+    {
+        i2s_del_channel(i2s_tx_chan);
+    }
+    if (i2s_rx_chan)
+    {
+        i2s_del_channel(i2s_rx_chan);
+    }
+
+    return ret;
 }
 
 esp_codec_dev_handle_t bsp_audio_codec_speaker_init(void)
 {
     if (i2s_data_if == NULL)
     {
         /* Initilize I2C */
-        ESP_ERROR_CHECK(bsp_i2c_init());
+        BSP_ERROR_CHECK_RETURN_NULL(bsp_i2c_init());
         /* Configure I2S peripheral and Power Amplifier */
-        ESP_ERROR_CHECK(bsp_audio_init(NULL));
+        BSP_ERROR_CHECK_RETURN_NULL(bsp_audio_init(NULL));
     }
     assert(i2s_data_if);
 
@@ -248,7 +262,7 @@ esp_codec_dev_handle_t bsp_audio_codec_speaker_init(void)
         .bus_handle = i2c_handle,
     };
     const audio_codec_ctrl_if_t *i2c_ctrl_if = audio_codec_new_i2c_ctrl(&i2c_cfg);
-    assert(i2c_ctrl_if);
+    BSP_NULL_CHECK(i2c_ctrl_if, NULL);
 
     esp_codec_dev_hw_gain_t gain = {
         .pa_voltage = 5.0,
@@ -258,7 +272,7 @@ esp_codec_dev_handle_t bsp_audio_codec_speaker_init(void)
     es8311_codec_cfg_t es8311_cfg = {
         .ctrl_if = i2c_ctrl_if,
         .gpio_if = gpio_if,
-        .codec_mode = ESP_CODEC_DEV_TYPE_OUT,
+        .codec_mode = ESP_CODEC_DEV_WORK_MODE_DAC,
         .pa_pin = BSP_POWER_AMP_IO,
         .pa_reverted = false,
         .master_mode = false,
@@ -269,10 +283,10 @@ esp_codec_dev_handle_t bsp_audio_codec_speaker_init(void)
         .hw_gain = gain,
     };
     const audio_codec_if_t *es8311_dev = es8311_codec_new(&es8311_cfg);
-    assert(es8311_dev);
+    BSP_NULL_CHECK(es8311_dev, NULL);
 
     esp_codec_dev_cfg_t codec_dev_cfg = {
-        .dev_type = ESP_CODEC_DEV_TYPE_IN_OUT,
+        .dev_type = ESP_CODEC_DEV_TYPE_OUT,
         .codec_if = es8311_dev,
         .data_if = i2s_data_if,
     };
@@ -284,50 +298,32 @@ esp_codec_dev_handle_t bsp_audio_codec_microphone_init(void)
     if (i2s_data_if == NULL)
     {
         /* Initilize I2C */
-        ESP_ERROR_CHECK(bsp_i2c_init());
+        BSP_ERROR_CHECK_RETURN_NULL(bsp_i2c_init());
         /* Configure I2S peripheral and Power Amplifier */
-        ESP_ERROR_CHECK(bsp_audio_init(NULL));
+        BSP_ERROR_CHECK_RETURN_NULL(bsp_audio_init(NULL));
     }
     assert(i2s_data_if);
 
-    const audio_codec_gpio_if_t *gpio_if = audio_codec_new_gpio();
-
     audio_codec_i2c_cfg_t i2c_cfg = {
         .port = BSP_I2C_NUM,
-        .addr = ES8311_CODEC_DEFAULT_ADDR,
+        .addr = BSP_ES7210_CODEC_ADDR,
         .bus_handle = i2c_handle,
     };
     const audio_codec_ctrl_if_t *i2c_ctrl_if = audio_codec_new_i2c_ctrl(&i2c_cfg);
-    assert(i2c_ctrl_if);
-
-    esp_codec_dev_hw_gain_t gain = {
-        .pa_voltage = 5.0,
-        .codec_dac_voltage = 3.3,
-    };
+    BSP_NULL_CHECK(i2c_ctrl_if, NULL);
 
-    es8311_codec_cfg_t es8311_cfg = {
+    es7210_codec_cfg_t es7210_cfg = {
         .ctrl_if = i2c_ctrl_if,
-        .gpio_if = gpio_if,
-        .codec_mode = ESP_CODEC_DEV_WORK_MODE_BOTH,
-        .pa_pin = BSP_POWER_AMP_IO,
-        .pa_reverted = false,
-        .master_mode = false,
-        .use_mclk = true,
-        .digital_mic = false,
-        .invert_mclk = false,
-        .invert_sclk = false,
-        .hw_gain = gain,
     };
+    const audio_codec_if_t *es7210_dev = es7210_codec_new(&es7210_cfg);
+    BSP_NULL_CHECK(es7210_dev, NULL);
 
-    const audio_codec_if_t *es8311_dev = es8311_codec_new(&es8311_cfg);
-    assert(es8311_dev);
-
-    esp_codec_dev_cfg_t codec_es8311_dev_cfg = {
+    esp_codec_dev_cfg_t codec_es7210_dev_cfg = {
         .dev_type = ESP_CODEC_DEV_TYPE_IN,
-        .codec_if = es8311_dev,
+        .codec_if = es7210_dev,
         .data_if = i2s_data_if,
     };
-    return esp_codec_dev_new(&codec_es8311_dev_cfg);
+    return esp_codec_dev_new(&codec_es7210_dev_cfg);
 }
 
 // Bit number used to represent command and parameter

bsp/esp32_p4_wifi6_touch_lcd_7b/idf_component.yml

@@ -16,4 +16,4 @@ tags:
 targets:
 - esp32p4
 url: https://www.waveshare.com/esp32-p4-wifi6-touch-lcd-7b.htm
-version: 1.0.1
+version: 1.0.2