Migrate ESP32 I2C port numbers to Arduino Port Numbers

Author: pschatzmann

src/Driver.h

@@ -291,7 +291,7 @@ class AudioDriverAC101Class : public AudioDriver {
  */
 class AudioDriverCS43l22Class : public AudioDriver {
 public:
-  AudioDriverCS43l22Class(uint16_t deviceAddr = 0x94 ) {
+  AudioDriverCS43l22Class(uint16_t deviceAddr = 0x4A) {
     this->deviceAddr = deviceAddr;
   }
 
@@ -829,7 +829,7 @@ class AudioDriverWM8960Class : public AudioDriver {
  */
 class AudioDriverWM8994Class : public AudioDriver {
 public:
-  AudioDriverWM8994Class(uint16_t deviceAddr = 0x34) {
+  AudioDriverWM8994Class(uint16_t deviceAddr = 0x1A) {
     this->deviceAddr = deviceAddr;
   }
 

src/Driver/ac101/ac101.h

@@ -11,7 +11,7 @@
 #define I2C_MASTER_READ 1
 
 
-#define AC101_ADDR			0x34		    /*!< Device address 0x1a/0x34 */
+#define AC101_ADDR			0x1A		    /*!< Device address 0x1a/0x34 */
 
 #undef READ_BIT
 #define WRITE_BIT  			I2C_MASTER_WRITE 	/*!< I2C master write */

src/Driver/es7210/es7210.c

@@ -30,7 +30,7 @@
 #define TAG_ES7210 "ES7210"
 
 /* ES7210 address*/
-#define ES7210_ADDR                   ES7210_AD1_AD0_00
+#define ES7210_ADDR                   ES7210_AD1_AD0_00>>1
 #define ES7210_MCLK_SOURCE            FROM_CLOCK_DOUBLE_PIN                            /* In master mode, 0 : MCLK from pad    1 : MCLK from clock doubler */
 #define FROM_PAD_PIN                  0
 #define FROM_CLOCK_DOUBLE_PIN         1

src/Driver/es7243/es7243.c

@@ -35,7 +35,7 @@
     }
 
 static i2c_bus_handle_t i2c_handle;
-static int es7243_addr = 0x26;
+static int es7243_addr = 0x13; // 0x26>>1;
 static int mclk_gpio = 0;
 
 // func_t AUDIO_CODEC_ES7243_DEFAULT_HANDLE = {

src/Driver/es7243e/es7243e.c

@@ -27,7 +27,7 @@
 
 //static char *TAG = "DRV7243E";
 static i2c_bus_handle_t i2c_handle;
-static int es7243e_addr = 0x20;
+static int es7243e_addr = 0x10; //0x20 >> 1;
 
 // func_t AUDIO_CODEC_ES7243E_DEFAULT_HANDLE = {
 //     .audio_codec_initialize = es7243e_adc_init,

src/Driver/es8156/es8156.c

@@ -27,8 +27,9 @@
 #include "es8156.h"
 
 #define BIT(nr)             (1 << (nr))
-#define ES8156_ADDR         0x10
-#define BOARD_PA_GAIN               (0) /* Power amplifier gain defined by board (dB) */
+// 0x8 = 0x10>>1
+#define ES8156_ADDR         0x8
+#define BOARD_PA_GAIN       (0) /* Power amplifier gain defined by board (dB) */
 
 //static const char *TAG = "DRV8156";
 static bool codec_init_flag = 0;

src/Driver/es8311/es8311.c

@@ -30,8 +30,9 @@
 
 /* ES8311 address
  * 0x32:CE=1;0x30:CE=0
+ * 0x30>>1 = 0x18
  */
-#define ES8311_ADDR         0x30
+#define ES8311_ADDR         0x18
 
 /*
  * to define the clock soure of MCLK

src/Driver/es8374/es8374.h

@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-/* ES8374 address */
-#define ES8374_ADDR 0x20  // 0x22:CE=1;0x20:CE=0
+/* ES8374 address 0x22:CE=1;0x20:CE=0 / 0x20>>1 = 0x10 */
+#define ES8374_ADDR 0x10 
 
 /**
  * @brief Initialize ES8374 codec chip

src/Driver/es8388/es8388.h

@@ -33,9 +33,8 @@
 extern "C" {
 #endif
 
-/* ES8388 address */
-#define ES8388_ADDR 0x20  /*!< 0x22:CE=1;0x20:CE=0*/
-
+/* ES8388 address  0x22:CE=1;0x20:CE=0 */
+#define ES8388_ADDR 0x10  
 /* ES8388 register */
 #define ES8388_CONTROL1         0x00
 #define ES8388_CONTROL2         0x01

src/Driver/tas5805m/tas5805m.c

@@ -26,8 +26,9 @@
 #include "tas5805m.h"
 #include "tas5805m_reg_cfg.h"
 #include "Utils/etc.h"
+// 0x5c>>1 = 0x2E
 
-#define TAS5805M_ADDR          0x5c
+#define TAS5805M_ADDR        0x2E    
 //#define TAS5805M_RST_GPIO      get_pa_enable_gpio()
 #define TAS5805M_VOLUME_MAX    100
 #define TAS5805M_VOLUME_MIN    0

src/Driver/wm8960/mtb_wm8960.h

@@ -49,8 +49,8 @@ extern "C"
 {
 #endif
 
-#define WM8960_I2C_ADDRESS          (0x1A)
-
+// (0x1A>>1) = 0xD
+#define WM8960_I2C_ADDRESS 0xD
 #ifdef ARDUINO
 #  define WM8960_LOG(msg)  Serial.println(msg)
 #else

src/Utils/I2C.cpp

@@ -42,14 +42,14 @@ error_t i2c_bus_read_bytes(i2c_bus_handle_t bus, int addr, uint8_t *reg,
   memset(outdata,0,datalen);
   int result = RESULT_OK;
 
-  p_wire->beginTransmission(addr >> 1);
+  p_wire->beginTransmission(addr);
   p_wire->write(reg, reglen);
   int rc = p_wire->endTransmission();
   if (rc != 0) {
     AD_LOGE("->p_wire->endTransmission: %d", rc);
   }
 
-  uint8_t result_len = p_wire->requestFrom((addr >> 1), datalen, (int) true);
+  uint8_t result_len = p_wire->requestFrom((addr), datalen, (int) true);
   if (result_len > 0) {
     result_len = p_wire->readBytes(outdata, datalen);
   } else {