From b0f8e880c4ddcb4152270b185a8fa83ac3f9a1cf Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Wed, 18 Sep 2024 18:05:45 +0200
Subject: [PATCH] fix(wifi_remote): Adjust per latest IDF v5.4

---
 .github/workflows/wifi_remote__build.yml             |  2 +-
 .../wifi_apps/roaming_app/src/Kconfig.roaming        |  0
 .../idf_v5.4/Kconfig.soc_wifi_caps.in                | 12 ++++++++++++
 .../scripts/generate_slave_configs.py                |  3 ++-
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 components/esp_wifi_remote/idf_v5.3/wifi_apps/roaming_app/src/Kconfig.roaming

diff --git a/.github/workflows/wifi_remote__build.yml b/.github/workflows/wifi_remote__build.yml
index 9e25e7cb254..85654bd8141 100644
--- a/.github/workflows/wifi_remote__build.yml
+++ b/.github/workflows/wifi_remote__build.yml
@@ -49,7 +49,7 @@ jobs:
         run: |
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
-          python ./scripts/generate_slave_configs.py ./components/esp_wifi_remote/${{matrix.test.path}}
+          python ./components/esp_wifi_remote/scripts/generate_slave_configs.py ./components/esp_wifi_remote/${{matrix.test.path}}
           python ./ci/build_apps.py ./components/esp_wifi_remote/${{matrix.test.path}} -vv --preserve-all
 
   build_wifi_remote_example:
diff --git a/components/esp_wifi_remote/idf_v5.3/wifi_apps/roaming_app/src/Kconfig.roaming b/components/esp_wifi_remote/idf_v5.3/wifi_apps/roaming_app/src/Kconfig.roaming
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/components/esp_wifi_remote/idf_v5.4/Kconfig.soc_wifi_caps.in b/components/esp_wifi_remote/idf_v5.4/Kconfig.soc_wifi_caps.in
index d1e5f4c1700..032f3f366ab 100644
--- a/components/esp_wifi_remote/idf_v5.4/Kconfig.soc_wifi_caps.in
+++ b/components/esp_wifi_remote/idf_v5.4/Kconfig.soc_wifi_caps.in
@@ -222,6 +222,10 @@ if SLAVE_IDF_TARGET_ESP32C6
         bool
         default y
 
+    config SLAVE_SOC_WIFI_MAC_VERSION_NUM
+        int
+        default 2
+
 endif # ESP32C6
 
 if SLAVE_IDF_TARGET_ESP32C5
@@ -266,6 +270,10 @@ if SLAVE_IDF_TARGET_ESP32C5
         bool
         default y
 
+    config SLAVE_SOC_WIFI_MAC_VERSION_NUM
+        int
+        default 3
+
 endif # ESP32C5
 
 if SLAVE_IDF_TARGET_ESP32C61
@@ -306,4 +314,8 @@ if SLAVE_IDF_TARGET_ESP32C61
         bool
         default y
 
+    config SLAVE_SOC_WIFI_MAC_VERSION_NUM
+        int
+        default 3
+
 endif # ESP32C61
diff --git a/components/esp_wifi_remote/scripts/generate_slave_configs.py b/components/esp_wifi_remote/scripts/generate_slave_configs.py
index ab9894ca752..33ebef9b237 100644
--- a/components/esp_wifi_remote/scripts/generate_slave_configs.py
+++ b/components/esp_wifi_remote/scripts/generate_slave_configs.py
@@ -10,7 +10,8 @@
 output_directory = sys.argv[1]
 
 # Input Kconfig file
-kconfig_file = f"idf_v{os.getenv('ESP_IDF_VERSION')}/Kconfig.slave_select.in"
+component_path = os.path.normpath(os.path.join(os.path.realpath(__file__),'..', '..'))
+kconfig_file = os.path.join(component_path, f"idf_v{os.getenv('ESP_IDF_VERSION')}", 'Kconfig.slave_select.in')
 
 # Output file prefix
 output_prefix = 'sdkconfig.ci.'