Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(config): Add support for disabling WiFi remote impl #3

Merged
merged 3 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/esp_wifi_remote/.cz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ commitizen:
bump_message: 'bump(wifi_remote): $current_version -> $new_version'
pre_bump_hooks: python ../../ci/changelog.py esp_wifi_remote
tag_format: wifi_remote-v$version
version: 0.4.0
version: 0.4.1
version_files:
- idf_component.yml
7 changes: 7 additions & 0 deletions components/esp_wifi_remote/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.4.1](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v0.4.1)

### Bug Fixes

- Remove unused Kconfig from scripts ([3c5d58f](https://github.com/espressif/esp-wifi-remote/commit/3c5d58f))
- Disable WiFi remote impl if ESP_HOST_WIFI_ENABLED=y ([1f6fe16](https://github.com/espressif/esp-wifi-remote/commit/1f6fe16))

## [0.4.0](https://github.com/espressif/esp-protocols/commits/wifi_remote-v0.4.0)

### Features
Expand Down
2 changes: 1 addition & 1 deletion components/esp_wifi_remote/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")

if(NOT CONFIG_ESP_WIFI_ENABLED)
if(NOT CONFIG_ESP_WIFI_ENABLED AND NOT CONFIG_ESP_HOST_WIFI_ENABLED)
set(src_wifi_is_remote esp_wifi_remote.c ${IDF_VER_DIR}/esp_wifi_with_remote.c esp_wifi_remote_net.c)
endif()

Expand Down
34 changes: 27 additions & 7 deletions components/esp_wifi_remote/Kconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
menu "Wi-Fi Remote"
config ESP_WIFI_REMOTE_ENABLED
bool
default y
default y if !ESP_HOST_WIFI_ENABLED
default n if ESP_HOST_WIFI_ENABLED

orsource "./idf_v$ESP_IDF_VERSION/Kconfig.slave_select.in"
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.soc_wifi_caps.in"
orsource "./Kconfig.rpc.in"
if ESP_WIFI_REMOTE_ENABLED
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.slave_select.in"
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.soc_wifi_caps.in"
orsource "./Kconfig.rpc.in"

menu "Wi-Fi configuration"
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.wifi.in"
endmenu
menu "Wi-Fi configuration"
orsource "./idf_v$ESP_IDF_VERSION/Kconfig.wifi.in"
endmenu
endif
if !ESP_WIFI_REMOTE_ENABLED

# This helper variables is only used to indicate that Wi-Fi remote if OFF
# and explains why
config ESP_WIFI_REMOTE_IS_DISABLED
bool "Wi-Fi Remote is disabled (Host Wi-Fi is ON)"
default y
help
Wi-Fi Remote is disabled because ESP_HOST_WIFI_ENABLED is ON.
These options are mutually exclusive.
Disable ESP_HOST_WIFI_ENABLED to use ESP_WIFI_REMOTE.

config ESP_WIFI_REMOTE_FORCE_DISABLED
bool
default y
select ESP_WIFI_REMOTE_IS_DISABLED
endif

endmenu # Wi-Fi Remote
4 changes: 2 additions & 2 deletions components/esp_wifi_remote/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: 0.4.0
url: https://github.com/espressif/esp-protocols/tree/master/components/esp_wifi_remote
version: 0.4.1
url: https://github.com/espressif/esp-wifi-remote
description: Utility wrapper for esp_wifi functionality on remote targets
dependencies:
espressif/eppp_link:
Expand Down
Loading
Loading