pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(i2c_master): Enhance i2c delete device and bus logic,

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/15171
This commit is contained in:
C.S.M
2025-01-21 15:55:32 +08:00
parent 3dd1ad9fdd
commit 847780da3e
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_i2c/i2c_master.c
+8 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -1134,6 +1134,13 @@ esp_err_t i2c_master_bus_rm_device(i2c_master_dev_handle_t handle)
esp_err_t i2c_del_master_bus(i2c_master_bus_handle_t bus_handle)
{
ESP_LOGD(TAG, "del i2c bus(%d)", bus_handle->base->port_num);
// Check if the device list is empty
if (!SLIST_EMPTY(&bus_handle->device_list)) {
ESP_LOGE(TAG, "Cannot delete I2C bus(%d): devices are still attached, please remove all devices and then delete bus", bus_handle->base->port_num);
return ESP_ERR_INVALID_STATE;
}
ESP_RETURN_ON_ERROR(i2c_master_bus_destroy(bus_handle), TAG, "destroy i2c bus failed");
return ESP_OK;
}
components/esp_driver_i2c/test_apps/i2c_test_apps/main/test_i2c_common.c
+2 -1
View File
@@ -141,8 +141,9 @@ TEST_CASE("I2C device add & remove check", "[i2c]")
i2c_master_bus_rm_device(dev_1);
i2c_master_bus_rm_device(dev_2);
i2c_master_bus_rm_device(dev_3);
TEST_ESP_ERR(ESP_ERR_INVALID_STATE, i2c_del_master_bus(bus_handle));
i2c_master_bus_rm_device(dev_3);
TEST_ESP_OK(i2c_del_master_bus(bus_handle));
}