Update machine_i2c.c

Signed-off-by: Vincent1-python <pywei201209@163.com>

Author: Vincent1-python

ports/esp32/machine_i2c.c

@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2025 Vincent1-python
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,44 +36,27 @@
 
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
-#if SOC_I2C_SUPPORT_XTAL
-#if CONFIG_XTAL_FREQ > 0
-#define I2C_SCLK_FREQ (CONFIG_XTAL_FREQ * 1000000)
-#else
-#error "I2C uses XTAL but no configured freq"
-#endif // CONFIG_XTAL_FREQ
-#elif SOC_I2C_SUPPORT_APB
-#define I2C_SCLK_FREQ APB_CLK_FREQ
-#else
-#error "unsupported I2C for ESP32 SoC variant"
-#endif
-
 #define I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-// ---------------- Internal data structures ----------------
 typedef struct _machine_hw_i2c_obj_t {
     mp_obj_base_t base;
     i2c_master_bus_handle_t bus_handle;
-    i2c_master_dev_handle_t dev_handle;
     uint8_t port : 8;
     gpio_num_t scl : 8;
     gpio_num_t sda : 8;
+    uint32_t freq;
+    uint32_t timeout_us;
 } machine_hw_i2c_obj_t;
 
 static machine_hw_i2c_obj_t machine_hw_i2c_obj[I2C_NUM_MAX];
 
-// ---------------- Initialization ----------------
-static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, uint32_t freq, uint32_t timeout_us, bool first_init) {
+static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, bool first_init) {
 
-    // 1. If already initialized, uninstall the old driver first
     if (!first_init && self->bus_handle) {
-        i2c_master_bus_rm_device(self->dev_handle);
         i2c_del_master_bus(self->bus_handle);
         self->bus_handle = NULL;
-        self->dev_handle = NULL;
     }
 
-    // 2. Configure the bus
     i2c_master_bus_config_t bus_cfg = {
         .i2c_port = self->port,
         .scl_io_num = self->scl,
@@ -82,126 +66,60 @@ static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, uint32_t freq, uint3
         .flags.enable_internal_pullup = true,
     };
     ESP_ERROR_CHECK(i2c_new_master_bus(&bus_cfg, &self->bus_handle));
-
-    // 3. Add a device (placeholder address; will be changed dynamically later)
-    i2c_device_config_t dev_cfg = {
-        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
-        .device_address = 0x00,               // Placeholder
-        .scl_speed_hz = freq,
-    };
-    ESP_ERROR_CHECK(i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &self->dev_handle));
 }
 
-int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags) {
+static int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
     machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    /* 0. Probe the address to see if any device responds */
-    esp_err_t err = i2c_master_probe(self->bus_handle, addr, 1000);
+    // 1. Probe the address to see if any device responds.
+    //    This test uses a fixed scl freq of 100_000.
+    esp_err_t err = i2c_master_probe(self->bus_handle, addr, self->timeout_us / 1000);
     if (err != ESP_OK) {
-        return -MP_ENODEV;          /* No device at address, return immediately */
+        return -MP_ENODEV;   // No device at address, return immediately
     }
-    /* 1. Create a temporary device handle for this transaction */
-    i2c_device_config_t dev_cfg = {
-        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
-        .device_address = addr,
-        .scl_speed_hz = 100000,   /* Use bus frequency */
-    };
-    i2c_master_dev_handle_t dev_handle;
-    err = i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &dev_handle);
-    if (err != ESP_OK) {
-        return -MP_ENODEV;
-    }
-
-    int data_len = 0;
 
-    /* 2. If WRITE1 segment exists, perform the write first */
-    if (flags & MP_MACHINE_I2C_FLAG_WRITE1) {
-        if (bufs->len) {
-            err = i2c_master_transmit(dev_handle, bufs->buf, bufs->len, 1000);                 /* Block with 1 s timeout */
-            if (err != ESP_OK) {
-                goto cleanup;
-            }
+    if (len > 0) {
+        // 2. Create a temporary device handle for this transaction
+        //    This step for every transaction can be omitted in
+        //    esp idf v5.5+, which supports handle address changing.
+        i2c_device_config_t dev_cfg = {
+            .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+            .device_address = addr,
+            .scl_speed_hz = self->freq,
+        };
+        i2c_master_dev_handle_t dev_handle;
+        err = i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &dev_handle);
+        if (err != ESP_OK) {
+            return -MP_ENODEV;
         }
-        data_len += bufs->len;
-        --n;
-        ++bufs;
-    }
-    if (flags & MP_MACHINE_I2C_FLAG_READ) {
-        /* 3. Main loop: remaining segments */
-        for (; n--; ++bufs) {
-            if (bufs->len == 0) {
-                continue;
-            }
-            err = i2c_master_receive(dev_handle, bufs->buf, bufs->len, 1000);
-            if (err != ESP_OK) {
-                break;
-            }
-
-            data_len += bufs->len;
+        // 3. Transfer data
+        if (flags & MP_MACHINE_I2C_FLAG_READ) {
+            err = i2c_master_receive(dev_handle, buf, len, self->timeout_us / 1000);
+        } else if (len > 0) {
+            err = i2c_master_transmit(dev_handle, buf, len, self->timeout_us / 1000);
         }
-    } else {
-        // Write operation logic
-        size_t total_len = 0;
-        mp_machine_i2c_buf_t *original_bufs = bufs;  // Save original pointer
-        size_t yuann = n;
-
-        // Calculate total length
-        for (; n--; ++bufs) {
-            total_len += bufs->len;
+        // 4. Destroy the temporary handle
+        i2c_master_bus_rm_device(dev_handle);
+        // 5. Map errors
+        if (err == ESP_FAIL) {
+            return -MP_ENODEV;
         }
-
-        // Reset pointer
-        bufs = original_bufs;
-        // Reset n
-        n = yuann;
-        // Dynamically allocate write_buf
-        uint8_t *write_buf = (uint8_t *)malloc(total_len);
-        if (write_buf == NULL) {
-            return -MP_ENOMEM;
+        if (err == ESP_ERR_TIMEOUT) {
+            return -MP_ETIMEDOUT;
         }
-
-        // Copy data into write_buf
-        size_t index = 0;
-        for (; n--; ++bufs) {
-            memcpy(write_buf + index, bufs->buf, bufs->len);
-            index += bufs->len;
-        }
-
-        // Transmit data
-        err = i2c_master_transmit(dev_handle, write_buf, total_len, 1000);
         if (err != ESP_OK) {
-            goto cleanup;
+            return -abs(err);
         }
-
-        // Free dynamically allocated memory
-        free(write_buf);
-    }
-
-cleanup:
-    /* 4. Immediately destroy the temporary handle */
-    i2c_master_bus_rm_device(dev_handle);
-
-    /* 5. Map errors */
-    if (err == ESP_FAIL) {
-        return -MP_ENODEV;
     }
-    if (err == ESP_ERR_TIMEOUT) {
-        return -MP_ETIMEDOUT;
-    }
-    if (err != ESP_OK) {
-        return -abs(err);
-    }
-
-    return data_len;
+    return len;
 }
 
-// ---------------- Print ----------------
 static void machine_hw_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "I2C(%u, scl=%u, sda=%u)", self->port, self->scl, self->sda);
+    mp_printf(print, "I2C(%u, scl=%u, sda=%u, freq=%u, timeout=%u)",
+        self->port, self->scl, self->sda, self->freq, self->timeout_us);
 }
 
-// ---------------- Constructor ----------------
 mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // Create a SoftI2C instance if no id is specified (or is -1) but other arguments are given
     if (n_args != 0) {
@@ -214,8 +132,8 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
         { MP_QSTR_id, MP_ARG_INT, {.u_int = I2C_NUM_0} },
         { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 400000} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = I2C_DEFAULT_TIMEOUT_US} },
+        { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -233,6 +151,8 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
         self->port = i2c_id;
         self->scl = (i2c_id == I2C_NUM_0) ? MICROPY_HW_I2C0_SCL : MICROPY_HW_I2C1_SCL;
         self->sda = (i2c_id == I2C_NUM_0) ? MICROPY_HW_I2C0_SDA : MICROPY_HW_I2C1_SDA;
+        self->freq = 400000;
+        self->timeout_us = I2C_DEFAULT_TIMEOUT_US;
     }
 
     if (args[ARG_scl].u_obj != MP_OBJ_NULL) {
@@ -241,15 +161,20 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     if (args[ARG_sda].u_obj != MP_OBJ_NULL) {
         self->sda = machine_pin_get_id(args[ARG_sda].u_obj);
     }
+    if (args[ARG_freq].u_int != -1) {
+        self->freq = args[ARG_freq].u_int;
+    }
+    if (args[ARG_timeout].u_int != -1) {
+        self->timeout_us = args[ARG_timeout].u_int;
+    }
 
-    machine_hw_i2c_init(self, args[ARG_freq].u_int, args[ARG_timeout].u_int, first_init);
+    machine_hw_i2c_init(self, first_init);
     return MP_OBJ_FROM_PTR(self);
 }
 
-// ---------------- Protocol table ----------------
 static const mp_machine_i2c_p_t machine_hw_i2c_p = {
-    .transfer_supports_write1 = true,
-    .transfer = machine_hw_i2c_transfer,
+    .transfer = mp_machine_i2c_transfer_adaptor,
+    .transfer_single = machine_i2c_transfer_single,
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(