Skip to content

Commit 936713b

Browse files
committed
Merge branch 'bugfix/idf6_requires' into 'master'
fix(led_indicator,button): Fix requires by IDF6 See merge request ae_group/esp-iot-solution!1391
2 parents 6563380 + 5d921e8 commit 936713b

File tree

6 files changed

+26
-4
lines changed

6 files changed

+26
-4
lines changed

components/button/CHANGELOG.md

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

3+
## v4.1.4 - 2025-10-08
4+
5+
### Fix:
6+
7+
* Fixed requires in CMake for IDF6.
8+
39
## v4.1.3 - 2025-04-11
410

511
### Fix:

components/button/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
set(PRIVREQ esp_timer)
2-
set(REQ driver)
2+
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.3")
3+
set(REQ esp_driver_gpio)
4+
else()
5+
set(REQ driver)
6+
endif()
37
set(SRC_FILES "button_gpio.c" "iot_button.c" "button_matrix.c")
48

59
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.0")

components/button/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "4.1.3"
1+
version: "4.1.4"
22
description: GPIO and ADC and Matrix button driver
33
url: https://github.com/espressif/esp-iot-solution/tree/master/components/button
44
repository: https://github.com/espressif/esp-iot-solution.git

components/led/led_indicator/CHANGELOG.md

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

3+
## v2.0.2 - 2025-10-08
4+
5+
### Bugfix
6+
7+
* Fixed requires in CMake for IDF6.
8+
39
## v2.0.1 - 2025-8-12
410

511
### Bugfix

components/led/led_indicator/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@ set(srcs "src/led_indicator_ledc.c"
88
"src/led_convert.c"
99
)
1010

11+
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.3")
12+
set(REQ esp_driver_ledc esp_driver_gpio)
13+
else()
14+
set(REQ driver)
15+
endif()
16+
1117
idf_component_register( SRCS ${srcs}
1218
INCLUDE_DIRS "include"
1319
PRIV_INCLUDE_DIRS "private_include"
14-
REQUIRES driver)
20+
REQUIRES ${REQ})
1521

1622
include(package_manager)
1723
cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})

components/led/led_indicator/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2.0.1"
1+
version: "2.0.2"
22
description: LED indicator driver
33
url: https://github.com/espressif/esp-iot-solution/tree/master/components/led/led_indicator
44
dependencies:

0 commit comments

Comments
 (0)