Merge pull request #51 from esp-cpp/feature/codec-i2c

finger563 · web-flow · commit d4f2d5ff6e04 · 2023-12-28T15:13:53.000-06:00
feat(codec): update codec to allow use of i2c read/write functions
diff --git a/components/box-emu-hal/src/i2s_audio.cpp b/components/box-emu-hal/src/i2s_audio.cpp
@@ -13,16 +13,16 @@
 #include "esp_system.h"
 #include "esp_check.h"
 
-#include "i2c.hpp"
 #include "task.hpp"
 #include "event_manager.hpp"
 
 #include "hal_events.hpp"
 
-#include "es7210.h"
-#include "es8311.h"
+#include "es7210.hpp"
+#include "es8311.hpp"
 
 #include "hal.hpp"
+#include "hal_i2c.hpp"
 
 using namespace box_hal;
 
@@ -256,6 +256,16 @@ void audio_init() {
 
   gpio_set_level(sound_power_pin, 1);
 
+  set_es7210_write(std::bind(&espp::I2c::write, internal_i2c.get(),
+                             std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+  set_es7210_read(std::bind(&espp::I2c::read_at_register, internal_i2c.get(),
+                            std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+
+  set_es8311_write(std::bind(&espp::I2c::write, internal_i2c.get(),
+                             std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+  set_es8311_read(std::bind(&espp::I2c::read_at_register, internal_i2c.get(),
+                            std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+
   i2s_driver_init();
   es7210_init_default();
   es8311_init_default();
diff --git a/components/codec/es7210/es7210.cpp b/components/codec/es7210/es7210.cpp
@@ -24,15 +24,21 @@
 
 #include <string.h>
 #include "esp_log.h"
-#include "es7210.h"
-#include "driver/i2c.h"
+#include "es7210.hpp"
+
+static write_fn i2c_write_ = nullptr;
+static read_register_fn i2c_read_register_ = nullptr;
+
+void set_es7210_write(write_fn fn) {
+    i2c_write_ = fn;
+}
+void set_es7210_read(read_register_fn fn) {
+    i2c_read_register_ = fn;
+}
 
 #define I2S_DSP_MODE_A 0
 #define MCLK_DIV_FRE   256
 
-#define I2C_MASTER_NUM (I2C_NUM_0)
-#define I2C_MASTER_TIMEOUT_MS (10)
-
 /* ES7210 address*/
 #define ES7210_ADDR                   ES7210_AD1_AD0_00
 #define ES7210_MCLK_SOURCE            FROM_CLOCK_DOUBLE_PIN                            /* In master mode, 0 : MCLK from pad    1 : MCLK from clock doubler */
@@ -56,8 +62,7 @@ struct _coeff_div {
 };
 
 static const char *TAG = "ES7210";
-// static i2c_bus_handle_t i2c_handle;
-static es7210_input_mics_t mic_select = ES7210_INPUT_MIC1 | ES7210_INPUT_MIC2 | ES7210_INPUT_MIC3 | ES7210_INPUT_MIC4;
+static es7210_input_mics_t mic_select = (es7210_input_mics_t)(ES7210_INPUT_MIC1 | ES7210_INPUT_MIC2 | ES7210_INPUT_MIC3 | ES7210_INPUT_MIC4);
 
 /* Codec hifi mclk clock divider coefficients
  *           MEMBER      REG
@@ -126,13 +131,8 @@ static const struct _coeff_div coeff_div[] = {
 
 static esp_err_t es7210_write_reg(uint8_t reg_addr, uint8_t data)
 {
-    //return i2c_bus_write_byte(i2c_handle, reg_addr, data);
     uint8_t write_buf[2] = {reg_addr, data};
-    return i2c_master_write_to_device(I2C_MASTER_NUM,
-                                      ES7210_ADDR,
-                                      write_buf,
-                                      sizeof(write_buf),
-                                      I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
+    return i2c_write_(ES7210_ADDR, write_buf, sizeof(write_buf)) == ESP_OK ? ESP_OK : ESP_FAIL;
 }
 
 static esp_err_t es7210_update_reg_bit(uint8_t reg_addr, uint8_t update_bits, uint8_t data)
@@ -160,14 +160,7 @@ int8_t get_es7210_mclk_src(void)
 int es7210_read_reg(uint8_t reg_addr)
 {
     uint8_t data;
-    // i2c_bus_read_byte(i2c_handle, reg_addr, &data);
-    i2c_master_write_read_device(I2C_MASTER_NUM,
-                                 ES7210_ADDR,
-                                 &reg_addr,
-                                 1, // size of addr
-                                 &data,
-                                 1, // amount of data to read
-                                 I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
+    i2c_read_register_(ES7210_ADDR, reg_addr, &data, 1);
     return (int)data;
 }
 
@@ -278,8 +271,6 @@ esp_err_t es7210_adc_init(audio_hal_codec_config_t *codec_cfg)
 {
     esp_err_t ret = ESP_OK;
 
-    // ret |= bsp_i2c_add_device(&i2c_handle, ES7210_ADDR);
-
     ret |= es7210_write_reg(ES7210_RESET_REG00, 0xff);
     ret |= es7210_write_reg(ES7210_RESET_REG00, 0x41);
     ret |= es7210_write_reg(ES7210_CLOCK_OFF_REG01, 0x1f);
@@ -328,7 +319,6 @@ esp_err_t es7210_adc_init(audio_hal_codec_config_t *codec_cfg)
 
 esp_err_t es7210_adc_deinit()
 {
-    // i2c_bus_delete(i2c_handle);
     return ESP_OK;
 }
 
@@ -480,9 +470,9 @@ esp_err_t es7210_adc_set_gain_all(es7210_gain_value_t gain)
     esp_err_t ret = ESP_OK;
     uint32_t  max_gain_vaule = 14;
     if (gain < 0) {
-        gain = 0;
+        gain = (es7210_gain_value_t)0;
     } else if (gain > max_gain_vaule) {
-        gain = max_gain_vaule;
+        gain = (es7210_gain_value_t)max_gain_vaule;
     }
     ESP_LOGD(TAG, "SET: gain:%d", gain);
     if (mic_select & ES7210_INPUT_MIC1) {
@@ -520,7 +510,7 @@ esp_err_t es7210_adc_get_gain(es7210_input_mics_t mic_mask, es7210_gain_value_t
         return regv;
     }
     gain_value = (regv & 0x0f);     /* Retain the last four bits for gain */
-    *gain = gain_value;
+    *gain = (es7210_gain_value_t)gain_value;
     ESP_LOGI(TAG, "GET: gain_value:%d", gain_value);
     return ESP_OK;
 }
diff --git a/components/codec/es7210/es7210.hpp b/components/codec/es7210/es7210.hpp
@@ -25,8 +25,16 @@
 #ifndef _ES7210_H
 #define _ES7210_H
 
+#include <functional>
+
 #include "audio_hal.h"
 
+typedef std::function<bool(uint8_t, uint8_t*, size_t)> write_fn;
+typedef std::function<bool(uint8_t, uint8_t, uint8_t*, size_t)> read_register_fn;
+
+void set_es7210_write(write_fn fn);
+void set_es7210_read(read_register_fn fn);
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/codec/es8311/es8311.cpp b/components/codec/es8311/es8311.cpp
@@ -24,17 +24,27 @@
 
 #include <string.h>
 #include "esp_log.h"
-#include "es8311.h"
-#include "driver/i2c.h"
+#include "es8311.hpp"
+
+static write_fn i2c_write_ = nullptr;
+static read_register_fn i2c_read_register_ = nullptr;
+
+void set_es8311_write(write_fn fn) {
+    i2c_write_ = fn;
+}
+void set_es8311_read(read_register_fn fn) {
+    i2c_read_register_ = fn;
+}
+
+#if !defined(BIT)
+#define BIT(x) (1U << (x))
+#endif
 
 /* ES8311 address
  * 0x32:CE=1;0x30:CE=0
  */
 #define ES8311_ADDR         0x18
 
-#define I2C_MASTER_NUM (I2C_NUM_0)
-#define I2C_MASTER_TIMEOUT_MS (10)
-
 /*
  * to define the clock soure of MCLK
  */
@@ -185,24 +195,14 @@ static esp_err_t es8311_write_reg(uint8_t reg_addr, uint8_t data)
 {
     // return i2c_bus_write_byte(i2c_handle, reg_addr, data);
     uint8_t write_buf[2] = {reg_addr, data};
-    return i2c_master_write_to_device(I2C_MASTER_NUM,
-                                      ES8311_ADDR,
-                                      write_buf,
-                                      sizeof(write_buf),
-                                      I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
+    bool success = i2c_write_(ES8311_ADDR, write_buf, sizeof(write_buf));
+    return success ? ESP_OK : ESP_FAIL;
 }
 
 static int es8311_read_reg(uint8_t reg_addr)
 {
     uint8_t data;
-    // i2c_bus_read_byte(i2c_handle, reg_addr, &data);
-    i2c_master_write_read_device(I2C_MASTER_NUM,
-                                 ES8311_ADDR,
-                                 &reg_addr,
-                                 1, // size of addr
-                                 &data,
-                                 1, // amount of data to read
-                                 I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
+    i2c_read_register_(ES8311_ADDR, reg_addr, &data, 1);
     return (int)data;
 }
 
@@ -261,8 +261,6 @@ esp_err_t es8311_codec_init(audio_hal_codec_config_t *codec_cfg)
     int coeff;
     esp_err_t ret = ESP_OK;
     
-    // ret |= bsp_i2c_add_device(&i2c_handle, ES8311_ADDR);
-
     ret |= es8311_write_reg(ES8311_CLK_MANAGER_REG01, 0x30);
     ret |= es8311_write_reg(ES8311_CLK_MANAGER_REG02, 0x00);
     ret |= es8311_write_reg(ES8311_CLK_MANAGER_REG03, 0x10);
@@ -450,7 +448,6 @@ esp_err_t es8311_codec_init(audio_hal_codec_config_t *codec_cfg)
 
 esp_err_t es8311_codec_deinit()
 {
-    // i2c_bus_delete(i2c_handle);
     return ESP_OK;
 }
 
@@ -525,7 +522,7 @@ esp_err_t es8311_codec_config_i2s(audio_hal_codec_mode_t mode, audio_hal_codec_i
 {
     int ret = ESP_OK;
     ret |= es8311_set_bits_per_sample(iface->bits);
-    ret |= es8311_config_fmt(iface->fmt);
+    ret |= es8311_config_fmt((es_i2s_fmt_t)(iface->fmt));
     return ret;
 }
 
diff --git a/components/codec/es8311/es8311.hpp b/components/codec/es8311/es8311.hpp
@@ -25,6 +25,14 @@
 #ifndef _ES8311_H
 #define _ES8311_H
 
+#include <functional>
+
+typedef std::function<bool(uint8_t, uint8_t*, size_t)> write_fn;
+typedef std::function<bool(uint8_t, uint8_t, uint8_t*, size_t)> read_register_fn;
+
+void set_es8311_write(write_fn fn);
+void set_es8311_read(read_register_fn fn);
+
 #include "audio_hal.h"
 #include "esp_types.h"
 #include "esxxx_common.h"
