espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 23:54:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/i2c_fix_typo_of_slave_macro' into 'master'

Browse Source 
i2c: fix typo in SOC_I2C_SUPPORT_SALVE

Closes IDFGH-6893

See merge request espressif/esp-idf!17373
This commit is contained in:
morris
2022-03-07 23:38:13 +08:00
parent 5f1c6ac605 9ebfd7832d
commit 4aa81975d1
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/i2c.c
View File

@@ -390,7 +390,7 @@ err:
if (p_i2c_obj[i2c_num]->cmd_mux) { if (p_i2c_obj[i2c_num]->cmd_mux) {
vSemaphoreDelete(p_i2c_obj[i2c_num]->cmd_mux); vSemaphoreDelete(p_i2c_obj[i2c_num]->cmd_mux);
} }
#if SOC_I2C_SUPPORT_SALVE #if SOC_I2C_SUPPORT_SLAVE
if (p_i2c_obj[i2c_num]->slv_rx_mux) { if (p_i2c_obj[i2c_num]->slv_rx_mux) {
vSemaphoreDelete(p_i2c_obj[i2c_num]->slv_rx_mux); vSemaphoreDelete(p_i2c_obj[i2c_num]->slv_rx_mux);
} }

4
examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp
View File

@@ -54,9 +54,8 @@ struct MasterFixture {
vector<uint8_t> data; vector<uint8_t> data;
}; };
#if SOC_I2C_SUPPORT_SALVE
// TODO The I2C driver tests are disabled, so disable them here, too. Probably due to no runners. // TODO The I2C driver tests are disabled, so disable them here, too. Probably due to no runners.
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP8684) #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C2)
static void i2c_slave_read_raw_byte(void) static void i2c_slave_read_raw_byte(void)
{ {
@@ -259,5 +258,4 @@ TEST_CASE_MULTIPLE_DEVICES("I2CMaster Composed transfer", "[cxx i2c][test_env=UT
i2c_master_composed_trans, i2c_slave_composed_trans); i2c_master_composed_trans, i2c_slave_composed_trans);
#endif //TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3) #endif //TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)
#endif // SOC_I2C_SUPPORT_SALVE
#endif // __cpp_exceptions #endif // __cpp_exceptions

2
examples/peripherals/i2c/i2c_tools/main/cmd_i2ctools.c
View File

@@ -31,7 +31,7 @@ static const char *TAG = "cmd_i2ctools";
#if CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32S3
static gpio_num_t i2c_gpio_sda = 1; static gpio_num_t i2c_gpio_sda = 1;
static gpio_num_t i2c_gpio_scl = 2; static gpio_num_t i2c_gpio_scl = 2;
#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2
static gpio_num_t i2c_gpio_sda = 5; static gpio_num_t i2c_gpio_sda = 5;
static gpio_num_t i2c_gpio_scl = 6; static gpio_num_t i2c_gpio_scl = 6;
#else #else