Skip to content

Commit 61ce0bf

Browse files
authored
Merge pull request #87 from david-cermak/update/v1.1.6
[v1.1.6]: Update per v5.3; Workarounds Kconfig issue
2 parents 56456f3 + 839cb57 commit 61ce0bf

File tree

29 files changed

+529
-277
lines changed

29 files changed

+529
-277
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_at.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/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: 2 additions & 2 deletions
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
@@ -50,7 +50,7 @@ jobs:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5151

5252
- name: Upload esp_wifi_remote to IDF Component Registry
53-
uses: espressif/upload-components-ci-action@v1
53+
uses: espressif/upload-components-ci-action@v2
5454
with:
5555
directories: >
5656
components/esp_wifi_remote;components/wifi_remote_over_eppp;components/wifi_remote_over_at

components/esp_wifi_remote/.cz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ commitizen:
33
bump_message: 'bump(wifi_remote): $current_version -> $new_version'
44
pre_bump_hooks: python ../../ci/changelog.py esp_wifi_remote
55
tag_format: wifi_remote-v$version
6-
version: 1.1.5
6+
version: 1.1.6
77
version_files:
88
- idf_component.yml

components/esp_wifi_remote/CHANGELOG.md

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

3+
## [1.1.6](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.1.6)
4+
5+
### Bug Fixes
6+
7+
- Fix Kconfig source indirecting per IDF version ([01e106c](https://github.com/espressif/esp-wifi-remote/commit/01e106c))
8+
- Update per v5.3 changes ([93cc864](https://github.com/espressif/esp-wifi-remote/commit/93cc864))
9+
310
## [1.1.5](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.1.5)
411

512
### Bug Fixes

components/esp_wifi_remote/Kconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ 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"
8+
orsource "./Kconfig.idf_v$ESP_IDF_VERSION.in"
109
orsource "./Kconfig.rpc.in"
1110

1211
config ESP_WIFI_REMOTE_EAP_ENABLED
@@ -17,9 +16,6 @@ menu "Wi-Fi Remote"
1716
When enabled, the EAP client remote API will be available.
1817
This allows remote control of EAP authentication functions.
1918

20-
menu "Wi-Fi configuration"
21-
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.wifi.in"
22-
endmenu
2319
endif
2420
if !ESP_WIFI_REMOTE_ENABLED
2521

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
config ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
2+
bool
3+
default y
4+
5+
rsource "./idf_v5.3/Kconfig.slave_select.in"
6+
rsource "./idf_v5.3/Kconfig.soc_wifi_caps.in"
7+
8+
menu "Wi-Fi configuration"
9+
rsource "./idf_v5.3/Kconfig.wifi.in"
10+
endmenu
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
config ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
2+
bool
3+
default y
4+
5+
rsource "./idf_v5.4/Kconfig.slave_select.in"
6+
rsource "./idf_v5.4/Kconfig.soc_wifi_caps.in"
7+
8+
menu "Wi-Fi configuration"
9+
rsource "./idf_v5.4/Kconfig.wifi.in"
10+
endmenu
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
config ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED
2+
bool
3+
default y
4+
5+
rsource "./idf_v5.5/Kconfig.slave_select.in"
6+
rsource "./idf_v5.5/Kconfig.soc_wifi_caps.in"
7+
8+
menu "Wi-Fi configuration"
9+
rsource "./idf_v5.5/Kconfig.wifi.in"
10+
endmenu

0 commit comments

Comments
 (0)