Skip to content

Commit fa7b891

Browse files
david-cermakdavid-cermak
committed
fix(wifi_remote): Fix Kconfig idf-path expansion
1 parent 56456f3 commit fa7b891

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+682
-276
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v3
2525
with:
2626
repository: espressif/esp-protocols
27-
ref: wifi_remote-v0.4.0
27+
ref: eppp-v1.1.3
2828
sparse-checkout: |
2929
ci/build_apps.py
3030
ci/ignore_build_warnings.txt
@@ -67,7 +67,7 @@ jobs:
6767
uses: actions/checkout@v3
6868
with:
6969
repository: espressif/esp-protocols
70-
ref: wifi_remote-v0.4.0
70+
ref: eppp-v1.1.3
7171
sparse-checkout: |
7272
ci/build_apps.py
7373
ci/ignore_build_warnings.txt

‎.github/workflows/build_eppp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v3
2525
with:
2626
repository: espressif/esp-protocols
27-
ref: wifi_remote-v0.4.0
27+
ref: eppp-v1.1.3
2828
sparse-checkout: |
2929
ci/build_apps.py
3030
ci/ignore_build_warnings.txt

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v4
2424
with:
2525
repository: espressif/esp-protocols
26-
ref: wifi_remote-v0.4.0
26+
ref: eppp-v1.1.3
2727
sparse-checkout: |
2828
ci/detect_component_bump
2929
sparse-checkout-cone-mode: false

‎components/esp_wifi_remote/CMakeLists.txt‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ idf_component_register(INCLUDE_DIRS include
99
REQUIRES esp_event esp_netif
1010
PRIV_REQUIRES esp_wifi esp-tls vfs)
1111

12+
# Set default version directory (branch version)
1213
set(IDF_VER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
1314

14-
# Check if we're on tagged version of ESP-IDF and if we need to supply specific version
15-
string(REGEX MATCH "^v[0-9]+\\.[0-9]+(\\.[0-9]+)?(-dirty)?$" IDF_VER_TAG "${IDF_VER}")
16-
if (IDF_VER_TAG)
17-
string(REGEX REPLACE "-dirty$" "" IDF_VER_TAG "${IDF_VER_TAG}")
18-
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/idf_tag_${IDF_VER_TAG}")
19-
set(IDF_VER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idf_tag_${IDF_VER_TAG}")
20-
endif()
15+
# Try exact tag version first (idf_tag_vX.Y.Z)
16+
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/idf_tag_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
17+
set(IDF_VER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idf_tag_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
2118
endif()
19+
# If exact tag doesn't exist, fall back to branch version (idf_vX.Y) - already set above
2220

2321
idf_component_get_property(wifi esp_wifi COMPONENT_LIB)
2422

‎components/esp_wifi_remote/Kconfig‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,18 @@ menu "Wi-Fi Remote"
55
default n if ESP_HOST_WIFI_ENABLED
66

77
if ESP_WIFI_REMOTE_ENABLED
8-
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.slave_select.in"
9-
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.soc_wifi_caps.in"
10-
orsource "./Kconfig.rpc.in"
8+
# Resolve version-specific includes via generated fragment located in the build directory.
9+
config ESP_IDF_VERSION
10+
string
11+
default "$ESP_IDF_VERSION"
12+
if ESP_IDF_VERSION>"5.3"
13+
orsource "./Kconfig.$IDF_VERSION.in"
14+
endif
15+
if ESP_IDF_VERSION="5.3"
16+
rsource "./idf_v5.3/Kconfig.in"
17+
endif
18+
19+
rsource "./Kconfig.rpc.in"
1120

1221
config ESP_WIFI_REMOTE_EAP_ENABLED
1322
bool "Enable EAP client remote API"
@@ -16,10 +25,6 @@ menu "Wi-Fi Remote"
1625
help
1726
When enabled, the EAP client remote API will be available.
1827
This allows remote control of EAP authentication functions.
19-
20-
menu "Wi-Fi configuration"
21-
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.wifi.in"
22-
endmenu
2328
endif
2429
if !ESP_WIFI_REMOTE_ENABLED
2530

‎components/esp_wifi_remote/Kconfig.5.3.0.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
orsource "./idf_tag_v5.3/Kconfig.in"
3+
4+
if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
5+
rsource "./idf_v5.3/Kconfig.in"
6+
endif

‎components/esp_wifi_remote/Kconfig.5.3.1.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
orsource "./idf_tag_v5.3.1/Kconfig.in"
3+
4+
if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
5+
rsource "./idf_v5.3/Kconfig.in"
6+
endif

‎components/esp_wifi_remote/Kconfig.5.3.2.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
orsource "./idf_tag_v5.3.2/Kconfig.in"
3+
4+
if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
5+
rsource "./idf_v5.3/Kconfig.in"
6+
endif

‎components/esp_wifi_remote/Kconfig.5.3.3.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
orsource "./idf_tag_v5.3.3/Kconfig.in"
3+
4+
if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
5+
rsource "./idf_v5.3/Kconfig.in"
6+
endif

‎components/esp_wifi_remote/Kconfig.5.3.4.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
orsource "./idf_tag_v5.3.4/Kconfig.in"
3+
4+
if !ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
5+
rsource "./idf_v5.3/Kconfig.in"
6+
endif

0 commit comments

Comments
 (0)