Skip to content

Commit 3679276

Browse files
committed
Merge branch 'feat/i2c_bus_remove_idf_version_in_kconfig' into 'master'
feat(i2c_bus): cancel I2C_BUS_BACKWARD_CONFIG IDF version limit See merge request ae_group/esp-iot-solution!1362
2 parents af7b920 + b11ebca commit 3679276

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

components/i2c_bus/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# ChangeLog
22

3+
## v1.4.2 - 2025-8-26
4+
5+
### Bug Fix:
6+
7+
- Remove the dependency of `I2C_BUS_BACKWARD_CONFIG` on the IDF version, and add CMake messages for I2C driver information.
8+
39
## V1.4.1 - 2025-8-14
410

511
### Bug Fix:

components/i2c_bus/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_LESS "5.3" OR CONFIG_I2C_BUS_BACKWARD_CONFIG)
22
set(SRC_FILE "i2c_bus.c")
33
set(REQ driver)
4+
message(STATUS "Using driver/i2c (SRC_FILE=i2c_bus.c, REQ=driver)")
45
else()
56
set(SRC_FILE "i2c_bus_v2.c")
67
set(REQ esp_driver_i2c driver)
8+
message(STATUS "Using esp_driver_i2c (SRC_FILE=i2c_bus_v2.c, REQ=esp_driver_i2c driver)")
79
endif()
810

911
if (CONFIG_I2C_BUS_SUPPORT_SOFTWARE)

components/i2c_bus/Kconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
menu "Bus Options"
22

33
menu "I2C Bus Options"
4-
config ESP_IDF_VERSION_FOR_I2C
5-
string
6-
option env="ESP_IDF_VERSION"
7-
84
config I2C_BUS_DYNAMIC_CONFIG
95
bool "enable dynamic configuration"
106
default y
@@ -22,9 +18,8 @@ menu "Bus Options"
2218
config I2C_BUS_BACKWARD_CONFIG
2319
bool "Enable backward compatibility for the I2C driver (force use of the old i2c_driver above v5.3)"
2420
default n
25-
depends on ESP_IDF_VERSION_FOR_I2C >= 5.3
2621
help
27-
Enable this option for backward compatibility with the old I2C driver
22+
Enable this option for backward compatibility with the old I2C driver (only valid in IDF v5.3 and above).
2823

2924
config I2C_BUS_SUPPORT_SOFTWARE
3025
bool "Enable software I2C support"

components/i2c_bus/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "1.4.1"
1+
version: "1.4.2"
22
description: The I2C Bus Driver supports both hardware and software I2C.
33
url: https://github.com/espressif/esp-iot-solution/tree/master/components/i2c_bus
44
repository: https://github.com/espressif/esp-iot-solution.git

0 commit comments

Comments
 (0)