fix(wifi_remote): Add specific version for v5.4 tag

espressif · Mar 5, 2025 · 076d80b · 076d80b
1 parent 41d1b3b
commit 076d80b
Show file tree

Hide file tree

Showing 13 changed files with 3,229 additions and 13 deletions.
diff --git a/.github/workflows/smoke_compat.yml b/.github/workflows/smoke_compat.yml
@@ -14,7 +14,7 @@ jobs:
     name: Check API compatibility of WiFi Remote
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.4", "release-v5.3"]
+        idf_ver: ["latest", "release-v5.4", "release-v5.3", "v5.4"]
     runs-on: ubuntu-20.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:

diff --git a/components/esp_wifi_remote/CMakeLists.txt b/components/esp_wifi_remote/CMakeLists.txt
@@ -1,7 +1,27 @@
+if(NOT CONFIG_ESP_WIFI_ENABLED AND NOT CONFIG_ESP_HOST_WIFI_ENABLED)
+    set(src_wifi_is_remote esp_wifi_remote.c esp_wifi_remote_net.c)
+endif()
+
+idf_component_register(INCLUDE_DIRS include
+                    SRCS ${src_wifi_is_remote}
+                    PRIV_INCLUDE_DIRS eppp
+                    REQUIRES esp_event esp_netif
+                    PRIV_REQUIRES esp_wifi esp-tls vfs)
+
+
 set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
 
+# Check if we're on tagged version of ESP-IDF and if we need to supply specific version
+string(REGEX MATCH "^v[0-9]+\\.[0-9]+(\\.[0-9]+)?(-dirty)?$" IDF_VER_TAG "${IDF_VER}")
+if (IDF_VER_TAG)
+    string(REGEX REPLACE "-dirty$" "" IDF_VER_TAG "${IDF_VER_TAG}")
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/idf_tag_${IDF_VER_TAG}")
+        set(IDF_VER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idf_tag_${IDF_VER_TAG}")
+    endif()
+endif()
+
 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)
+    set(src_wifi_with_remote ${IDF_VER_DIR}/esp_wifi_with_remote.c)
 endif()
 
 if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
@@ -10,13 +30,11 @@ else()
     set(src_wifi_remote_weak ${IDF_VER_DIR}/esp_wifi_remote_weak.c)
 endif()
 
-idf_component_register(INCLUDE_DIRS include ${IDF_VER_DIR}/include
-                    SRCS ${src_wifi_remote_weak}
-                         ${src_wifi_remote_eppp}
-                         ${src_wifi_is_remote}
-                    PRIV_INCLUDE_DIRS eppp
-                    REQUIRES esp_event esp_netif
-                    PRIV_REQUIRES esp_wifi esp-tls vfs)
+
+target_include_directories(${COMPONENT_LIB} PUBLIC ${IDF_VER_DIR}/include)
+target_sources(${COMPONENT_LIB} PRIVATE ${src_wifi_remote_weak}
+                                        ${src_wifi_remote_eppp}
+                                        ${src_wifi_with_remote})
 
 idf_component_get_property(wifi esp_wifi COMPONENT_LIB)
 target_link_libraries(${wifi} PUBLIC ${COMPONENT_LIB})
diff --git a/components/esp_wifi_remote/idf_tag_v5.4/Kconfig.slave_select.in b/components/esp_wifi_remote/idf_tag_v5.4/Kconfig.slave_select.in
@@ -0,0 +1,21 @@
+# This file is auto-generated
+    choice SLAVE_IDF_TARGET
+    prompt "choose slave target"
+    default SLAVE_IDF_TARGET_ESP32
+    config SLAVE_IDF_TARGET_ESP32
+        bool "esp32"
+    config SLAVE_IDF_TARGET_ESP32S2
+        bool "esp32s2"
+    config SLAVE_IDF_TARGET_ESP32C3
+        bool "esp32c3"
+    config SLAVE_IDF_TARGET_ESP32S3
+        bool "esp32s3"
+    config SLAVE_IDF_TARGET_ESP32C2
+        bool "esp32c2"
+    config SLAVE_IDF_TARGET_ESP32C6
+        bool "esp32c6"
+    config SLAVE_IDF_TARGET_ESP32C5
+        bool "esp32c5"
+    config SLAVE_IDF_TARGET_ESP32C61
+        bool "esp32c61"
+    endchoice