Merge branch 'bugfix/app_network_configs' into 'master'

app_network: Handle renaming of app_wifi config options to app_network See merge request app-frameworks/esp-rainmaker!475
espressif · Sep 20, 2024 · 86f0c19 · 86f0c19
2 parents 3328c72 + 41c7d54
commit 86f0c19
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/examples/common/app_network/sdkconfig.rename b/examples/common/app_network/sdkconfig.rename
@@ -0,0 +1,13 @@
+# sdkconfig replacement configurations for deprecated options formatted as
+# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
+
+
+CONFIG_APP_WIFI_PROV_SHOW_QR            CONFIG_APP_NETWORK_PROV_SHOW_QR
+CONFIG_APP_WIFI_PROV_MAX_POP_MISMATCH   CONFIG_APP_NETWORK_PROV_MAX_POP_MISMATCH
+CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP   CONFIG_APP_NETWORK_PROV_TRANSPORT_SOFTAP
+CONFIG_APP_WIFI_PROV_TRANSPORT_BLE      CONFIG_APP_NETWORK_PROV_TRANSPORT_BLE
+CONFIG_APP_WIFI_PROV_TRANSPORT          CONFIG_APP_NETWORK_PROV_TRANSPORT
+CONFIG_APP_WIFI_RESET_PROV_ON_FAILURE   CONFIG_APP_NETWORK_RESET_PROV_ON_FAILURE
+CONFIG_APP_WIFI_SHOW_DEMO_INTRO_TEXT    CONFIG_APP_NETWORK_SHOW_DEMO_INTRO_TEXT
+CONFIG_APP_WIFI_PROV_TIMEOUT_PERIOD     CONFIG_APP_NETWORK_PROV_TIMEOUT_PERIOD
+CONFIG_APP_WIFI_PROV_NAME_PREFIX        CONFIG_APP_NETWORK_PROV_NAME_PREFIX
diff --git a/...switch/components/app_wifi/CMakeLists.txt → ...tch/components/app_network/CMakeLists.txt b/...switch/components/app_wifi/CMakeLists.txt → ...tch/components/app_network/CMakeLists.txt
diff --git a/...tch/components/app_wifi/Kconfig.projbuild → .../components/app_network/Kconfig.projbuild b/...tch/components/app_wifi/Kconfig.projbuild → .../components/app_network/Kconfig.projbuild
diff --git a/...mponents/app_wifi/app_wifi_with_homekit.c → ...nents/app_network/app_wifi_with_homekit.c b/...mponents/app_wifi/app_wifi_with_homekit.c → ...nents/app_network/app_wifi_with_homekit.c
diff --git a/...mponents/app_wifi/app_wifi_with_homekit.h → ...nents/app_network/app_wifi_with_homekit.h b/...mponents/app_wifi/app_wifi_with_homekit.h → ...nents/app_network/app_wifi_with_homekit.h
diff --git a/...t_switch/components/app_wifi/component.mk → ...witch/components/app_network/component.mk b/...t_switch/components/app_wifi/component.mk → ...witch/components/app_network/component.mk