Improved IDF v6 i2c code

Author: bitbank2

examples/Arduino/LilyGoT5_Shutdown/LilyGoT5_Shutdown.ino

@@ -9,8 +9,8 @@ FASTEPD epaper;
 
 #define PWRMGMT_ADDR 0x6b
 #define REG09 9
-#define SDA_PIN 6
-#define SCL_PIN 5
+#define SDA_PIN 39
+#define SCL_PIN 40
 extern "C" {
 void s3_prep_diff(uint8_t *pCurr, uint8_t *pPrev, uint8_t *pDest, int iWidth);
 }
@@ -66,7 +66,8 @@ void setup()
    delay(3000);
    Serial.println("Starting...");
  //  TestSIMD();
-   epaper.initPanel(BB_PANEL_LILYGO_T5PRO);
+   epaper.initPanel(BB_PANEL_EPDIY_V7);
+   epaper.setPanelSize(960, 540);
    epaper.clearWhite();
    epaper.setFont(FONT_12x16);
    epaper.println("Power off in 5 seconds...");

src/arduino_io.inl

@@ -33,8 +33,9 @@ static int iDelay = 0; //1;
 #include "driver/gpio.h"
 #include "esp_timer.h"
 #include "driver/i2c_master.h"
-i2c_master_bus_handle_t bus_handle;
-i2c_master_dev_handle_t dev_handle;
+i2c_master_bus_handle_t bus_handle = 0;
+i2c_master_dev_handle_t dev_handle = 0;
+uint8_t u8Address = 0xff;
 // GPIO modes
 #define memcpy_P memcpy
 #define pgm_read_byte(a) (*(uint8_t *)a)
@@ -278,6 +279,8 @@ int bbepI2CInit(uint8_t sda, uint8_t scl, int bb)
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     i2c_master_bus_config_t conf;
 
+    if (bus_handle) return BBEP_SUCCESS; // already initialized
+
     conf.i2c_port = I2C_NUM_0;
     conf.sda_io_num = (gpio_num_t)sda;
     conf.scl_io_num = (gpio_num_t)scl;
@@ -318,12 +321,19 @@ int bbepI2CWrite(unsigned char iAddr, unsigned char *pData, int iLen)
 #else
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     i2c_device_config_t dev_config;
-    dev_config.dev_addr_length = I2C_ADDR_BIT_LEN_7;
-    dev_config.device_address = iAddr; 
-    dev_config.scl_speed_hz = 400000;
-    ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_config, &dev_handle));
+
+    if (dev_handle || u8Address != iAddr) {
+        if (dev_handle) {
+            ESP_ERROR_CHECK(i2c_master_bus_rm_device(dev_handle));
+            dev_handle = 0;
+        }
+        dev_config.dev_addr_length = I2C_ADDR_BIT_LEN_7;
+        dev_config.device_address = iAddr; 
+        dev_config.scl_speed_hz = 400000;
+        ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_config, &dev_handle));
+        u8Address = iAddr;
+    }
     esp_err_t ret = i2c_master_transmit(dev_handle, pData, iLen, 1000); // 1-second timeout
-    i2c_master_bus_rm_device(dev_handle);
     return (ret == ESP_OK);
 #else // older idf version
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
@@ -357,12 +367,18 @@ int i = 0;
     esp_err_t ret;
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     i2c_device_config_t dev_config;
-    dev_config.dev_addr_length = I2C_ADDR_BIT_LEN_7;
-    dev_config.device_address = iAddr;
-    dev_config.scl_speed_hz = 400000;
-    ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_config, &dev_handle));
+    if (dev_handle || u8Address != iAddr) {
+        if (dev_handle) {
+            ESP_ERROR_CHECK(i2c_master_bus_rm_device(dev_handle));
+            dev_handle = 0;
+        }
+        dev_config.dev_addr_length = I2C_ADDR_BIT_LEN_7;
+        dev_config.device_address = iAddr;
+        dev_config.scl_speed_hz = 400000;
+        ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_config, &dev_handle));
+        u8Address = iAddr;
+    }
     ret = i2c_master_receive(dev_handle, pData, iLen, 1000); // 1-second timeout
-    i2c_master_bus_rm_device(dev_handle);
     return (ret == ESP_OK);
 #else // older ESP-IDF
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();