Merus i2c correction

aqibluesky · Dec 8, 2017 · d770874 · d770874
1 parent ab47841
commit d770874
Show file tree

Hide file tree

Showing 17 changed files with 2,891 additions and 2,896 deletions.
diff --git a/build/KaRadio32.bin b/build/KaRadio32.bin
diff --git a/build/KaRadio32.elf b/build/KaRadio32.elf
diff --git a/build/KaRadio32.map b/build/KaRadio32.map
diff --git a/build/MerusAudio/MerusAudio.o b/build/MerusAudio/MerusAudio.o
diff --git a/build/MerusAudio/libMerusAudio.a b/build/MerusAudio/libMerusAudio.a
diff --git a/build/audio_renderer/audio_renderer.o b/build/audio_renderer/audio_renderer.o
diff --git a/build/audio_renderer/libaudio_renderer.a b/build/audio_renderer/libaudio_renderer.a
diff --git a/build/main/gpio.o b/build/main/gpio.o
diff --git a/build/main/libmain.a b/build/main/libmain.a
diff --git a/build/u8g2/csrc/u8g2_esp32_hal.o b/build/u8g2/csrc/u8g2_esp32_hal.o
diff --git a/build/u8g2/libu8g2.a b/build/u8g2/libu8g2.a
diff --git a/build/ucglib/csrc/ucg_esp32_hal.o b/build/ucglib/csrc/ucg_esp32_hal.o
diff --git a/build/ucglib/libucglib.a b/build/ucglib/libucglib.a
diff --git a/components/MerusAudio/MerusAudio.c b/components/MerusAudio/MerusAudio.c
@@ -34,7 +34,7 @@
 #define I2C_MASTER_NUM I2C_NUM_0   /*!< I2C port number for master dev */
 #define I2C_MASTER_TX_BUF_DISABLE   0   /*!< I2C master do not need buffer */
 #define I2C_MASTER_RX_BUF_DISABLE   0   /*!< I2C master do not need buffer */
-#define I2C_MASTER_FREQ_HZ    100000     /*!< I2C master clock frequency */
+#define I2C_MASTER_FREQ_HZ    80000     /*!< I2C master clock frequency */
 
 #define MA12040_ADDR  0x20   /*!< slave address for MA12040 amplifier */
 
@@ -47,7 +47,9 @@
 
 
 void i2c_master_init()
-{   int i2c_master_port = I2C_MASTER_NUM;
+{   
+// KaRadio32, I2C may be already configured.
+	int i2c_master_port = I2C_MASTER_NUM;
     i2c_config_t conf;
     conf.mode = I2C_MODE_MASTER;
     conf.sda_io_num = I2C_MASTER_SDA_IO;
@@ -58,7 +60,8 @@ void i2c_master_init()
     esp_err_t res = i2c_param_config(i2c_master_port, &conf);
     printf("Driver param setup : %d\n",res);
 	res = i2c_driver_install(i2c_master_port, conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0);
-    printf("Driver installed   : %d\n",res);
+	if (res != 0) printf("Driver already installed. No problem \n");
+	else printf("Driver installed   : %d\n",res);
     //i2c_set_period(i2c_master_port,100,99);
 }
 

diff --git a/components/audio_renderer/audio_renderer.c b/components/audio_renderer/audio_renderer.c
@@ -295,15 +295,6 @@ void render_samples(char *buf, uint32_t buf_len, pcm_format_t *buf_desc)
             ptr_l += stride;
         }
     }
-
-    /* takes too long
-    i2s_event_t evt = {0};
-    if(xQueueReceive(i2s_event_queue, &evt, 0)) {
-        if(evt.type == I2S_EVENT_TX_DONE) {
-            ESP_LOGE(TAG, "DMA Buffer Underflow");
-        }
-    }
-    */
 }
 
 

diff --git a/components/u8g2/csrc/u8g2_esp32_hal.c b/components/u8g2/csrc/u8g2_esp32_hal.c
@@ -117,19 +117,20 @@ uint8_t u8g2_esp32_msg_i2c_cb(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *
 
 		    i2c_config_t conf;
 		    conf.mode = I2C_MODE_MASTER;
-			ESP_LOGD(TAG, "sda_io_num %d", u8g2_esp32_hal.sda);
 		    conf.sda_io_num = u8g2_esp32_hal.sda;
 		    conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
-			ESP_LOGD(TAG, "scl_io_num %d", u8g2_esp32_hal.scl);
 		    conf.scl_io_num = u8g2_esp32_hal.scl;
 		    conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
-			ESP_LOGD(TAG, "clk_speed %d", I2C_MASTER_FREQ_HZ);
 		    conf.master.clk_speed = I2C_MASTER_FREQ_HZ;
+			ESP_LOGD(TAG, "sda_io_num %d", u8g2_esp32_hal.sda);
+			ESP_LOGD(TAG, "scl_io_num %d", u8g2_esp32_hal.scl);
+			ESP_LOGD(TAG, "clk_speed %d", I2C_MASTER_FREQ_HZ);
 			ESP_LOGD(TAG, "i2c_param_config %d", conf.mode);
 		    ESP_ERROR_CHECK(i2c_param_config(I2C_MASTER_NUM, &conf));
 			ESP_LOGD(TAG, "i2c_driver_install %d", I2C_MASTER_NUM);
-		    ESP_ERROR_CHECK(i2c_driver_install(I2C_MASTER_NUM, conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0));
-/*
+		    ESP_ERROR_CHECK(i2c_driver_install(I2C_MASTER_NUM, conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0));	
+
+			/*
 			i2c_cmd_handle_t cmd = i2c_cmd_link_create(); // dummy write
 			ESP_ERROR_CHECK(i2c_master_start(cmd));
 			ESP_ERROR_CHECK(i2c_master_write_byte(cmd, 0x00 | I2C_MASTER_WRITE, ACK_CHECK_DIS));

diff --git a/components/u8g2/csrc/u8g2_esp32_hal.h b/components/u8g2/csrc/u8g2_esp32_hal.h
@@ -18,7 +18,7 @@
 #define I2C_MASTER_NUM I2C_NUM_0   /*!< I2C port number for master dev */
 #define I2C_MASTER_TX_BUF_DISABLE   0   /*!< I2C master do not need buffer */
 #define I2C_MASTER_RX_BUF_DISABLE   0   /*!< I2C master do not need buffer */
-#define I2C_MASTER_FREQ_HZ    50000     /*!< I2C master clock frequency */
+#define I2C_MASTER_FREQ_HZ    80000     /*!< I2C master clock frequency */
 #define ACK_CHECK_EN   0x1     /*!< I2C master will check ack from slave*/
 #define ACK_CHECK_DIS  0x0     /*!< I2C master will not check ack from slave */