Merge branch 'bugfix/fix_8388_vol_map' into 'master'

esp_codec_dev: Fix es8388 set volume reg not correct

See merge request adf/esp-adf-internal!1173

Author: jason-mao

components/esp_codec_dev/device/es7210/es7210.c

@@ -220,6 +220,8 @@ static int es7210_mic_select(audio_codec_es7210_t *codec, es7210_input_mics_t mi
     if (mic_num >= ENABLE_TDM_MAX_NUM) {
         ret |= es7210_write_reg(codec, ES7210_SDP_INTERFACE2_REG12, 0x02);
         ESP_LOGI(TAG, "Enable TDM mode");
+    } else {
+        ret |= es7210_write_reg(codec, ES7210_SDP_INTERFACE2_REG12, 0x00);
     }
     return ret;
 }

components/esp_codec_dev/device/es8311/es8311.c

@@ -547,6 +547,8 @@ static int es8311_open(const audio_codec_if_t *h, void *cfg, int cfg_size)
     if (codec_cfg->no_dac_ref == false) {
         /* set internal reference signal (ADCL + DACR) */
         ret |= es8311_write_reg(codec, ES8311_GPIO_REG44, 0x50);
+    } else {
+        ret |= es8311_write_reg(codec, ES8311_GPIO_REG44, 0);
     }
     if (ret != 0) {
         return ESP_CODEC_DEV_WRITE_FAIL;

components/esp_codec_dev/device/es8388/es8388.c

@@ -28,7 +28,7 @@ static const esp_codec_dev_vol_range_t vol_range = {
     .min_vol =
     {
         .vol = 0xC0,
-        .db_value = -96.5,
+        .db_value = -96,
     },
     .max_vol =
     {
@@ -250,6 +250,12 @@ static int es8388_open(const audio_codec_if_t *h, void *cfg, int cfg_size)
     res |= es8388_write_reg(codec, ES8388_DACCONTROL21, 0x80);
     res |= es8388_write_reg(codec, ES8388_DACCONTROL23, 0x00);    // vroi=0
     res |= es8388_set_adc_dac_volume(codec, ES_MODULE_DAC, 0, 0); // 0db
+
+    res |= es8388_write_reg(codec, ES8388_DACCONTROL24, 0x1E); // Set L1 R1 L2 R2 volume. 0x00: -30dB, 0x1E: 0dB, 0x21: 3dB
+    res |= es8388_write_reg(codec, ES8388_DACCONTROL25, 0x1E);
+    res |= es8388_write_reg(codec, ES8388_DACCONTROL26, 0);
+    res |= es8388_write_reg(codec, ES8388_DACCONTROL27, 0);
+
     // TODO default use DAC_ALL
     int tmp = DAC_OUTPUT_LOUT1 | DAC_OUTPUT_LOUT2 | DAC_OUTPUT_ROUT1 | DAC_OUTPUT_ROUT2;
     res |= es8388_write_reg(codec, ES8388_DACPOWER, tmp); // 0x3c Enable DAC and Enable Lout/Rout/1/2
@@ -324,10 +330,8 @@ static int es8388_set_vol(const audio_codec_if_t *h, float db_value)
     }
     db_value -= codec->hw_gain;
     int volume = esp_codec_dev_vol_calc_reg(&vol_range, db_value);
-    int res = es8388_write_reg(codec, ES8388_DACCONTROL24, volume);
-    res |= es8388_write_reg(codec, ES8388_DACCONTROL25, volume);
-    res |= es8388_write_reg(codec, ES8388_DACCONTROL26, 0);
-    res |= es8388_write_reg(codec, ES8388_DACCONTROL27, 0);
+    int res = es8388_write_reg(codec, ES8388_DACCONTROL5, volume);
+    res |= es8388_write_reg(codec, ES8388_DACCONTROL4, volume);
     ESP_LOGD(TAG, "Set volume reg:%x db:%f", volume, db_value);
     return res ? ESP_CODEC_DEV_WRITE_FAIL : ESP_CODEC_DEV_OK;
 }

components/esp_codec_dev/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.0.0
+version: 1.0.1
 description: Audio codec device support for Espressif SOC
 url: https://github.com/espressif/esp-adf/tree/master/components/esp_codec_dev
 

components/esp_codec_dev/include/esp_codec_dev_types.h

@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-#define ESP_CODEC_DEV_VERSION  "1.0.0"
+#define ESP_CODEC_DEV_VERSION  "1.0.1"
 
 /**
  * @brief Define error number of codec device module