Merge branch 'refactor/move_smartconfig_ack_to_wifi_v4.0' into 'release/v4.0'

smartconfig: move smartconfig_ack to esp_wifi conponent (v4.0) See merge request espressif/esp-idf!5999
2025-07-31 19:24:33 +02:00 · 2019-09-06 14:27:29 +08:00
parent 1b8ed9abf0 dcf571c1cd
commit 2c49592216
5 changed files with 2 additions and 6 deletions
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -11,9 +11,10 @@ idf_component_register(SRCS "src/coexist.c"
                            "src/phy_init.c"
                            "src/restore.c"
                            "src/smartconfig.c"
+                            "src/smartconfig_ack.c"
                            "src/wifi_init.c"
                    INCLUDE_DIRS "include" "${idf_target}/include"
-                    PRIV_REQUIRES wpa_supplicant nvs_flash smartconfig_ack
+                    PRIV_REQUIRES wpa_supplicant nvs_flash
                    LDFRAGMENTS "${ldfragments}")

 idf_build_get_property(build_dir BUILD_DIR)
--- a/components/smartconfig_ack/include/smartconfig_ack.h
+++ b/components/smartconfig_ack/include/smartconfig_ack.h
--- a/components/smartconfig_ack/smartconfig_ack.c
+++ b/components/smartconfig_ack/smartconfig_ack.c
--- a/components/smartconfig_ack/CMakeLists.txt
+++ b/components/smartconfig_ack/CMakeLists.txt
@@ -1,3 +0,0 @@
-idf_component_register(SRCS "smartconfig_ack.c"
-                    INCLUDE_DIRS include
-                    PRIV_REQUIRES lwip tcpip_adapter)
--- a/components/smartconfig_ack/component.mk
+++ b/components/smartconfig_ack/component.mk
@@ -1,2 +0,0 @@
-#
-# Component Makefile