feat(wifi_remote): Support for IDF v5.4 via a separate dir

Author: david-cermak

components/esp_wifi_remote/CMakeLists.txt

@@ -1,14 +1,16 @@
+set(IDF_VER_DIR "idf_v$ENV{ESP_IDF_VERSION}")
+
 if(NOT CONFIG_ESP_WIFI_ENABLED)
-    set(src_wifi_is_remote esp_wifi_remote.c esp_wifi_with_remote.c esp_wifi_remote_net.c)
+    set(src_wifi_is_remote esp_wifi_remote.c ${IDF_VER_DIR}/esp_wifi_with_remote.c esp_wifi_remote_net.c)
 endif()
 
 if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
     set(src_wifi_remote_eppp eppp/wifi_remote_rpc_client.cpp eppp/wifi_remote_rpc_server.cpp eppp/eppp_init.c)
 else()
-    set(src_wifi_remote_weak esp_wifi_remote_weak.c)
+    set(src_wifi_remote_weak ${IDF_VER_DIR}/esp_wifi_remote_weak.c)
 endif()
 
-idf_component_register(INCLUDE_DIRS include
+idf_component_register(INCLUDE_DIRS include ${IDF_VER_DIR}/include
                     SRCS ${src_wifi_remote_weak}
                          ${src_wifi_remote_eppp}
                          ${src_wifi_is_remote}

components/esp_wifi_remote/Kconfig

@@ -16,4 +16,6 @@
         bool "esp32c6"
     config SLAVE_IDF_TARGET_ESP32C5
         bool "esp32c5"
+    config SLAVE_IDF_TARGET_ESP32C61
+        bool "esp32c61"
     endchoice

components/esp_wifi_remote/Kconfig.slave_select.in renamed to components/esp_wifi_remote/idf_v5.4/Kconfig.slave_select.in

@@ -267,3 +267,43 @@ if SLAVE_IDF_TARGET_ESP32C5
         default y
 
 endif # ESP32C5
+
+if SLAVE_IDF_TARGET_ESP32C61
+
+    config SLAVE_SOC_WIFI_SUPPORTED
+        bool
+        default y
+
+    config SLAVE_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH
+        int
+        default 12
+
+    config SLAVE_SOC_WIFI_HW_TSF
+        bool
+        default y
+
+    config SLAVE_SOC_WIFI_FTM_SUPPORT
+        bool
+        default n
+
+    config SLAVE_SOC_WIFI_GCMP_SUPPORT
+        bool
+        default y
+
+    config SLAVE_SOC_WIFI_WAPI_SUPPORT
+        bool
+        default y
+
+    config SLAVE_SOC_WIFI_CSI_SUPPORT
+        bool
+        default y
+
+    config SLAVE_SOC_WIFI_MESH_SUPPORT
+        bool
+        default y
+
+    config SLAVE_SOC_WIFI_HE_SUPPORT
+        bool
+        default y
+
+endif # ESP32C61

components/esp_wifi_remote/Kconfig.soc_wifi_caps.in renamed to components/esp_wifi_remote/idf_v5.4/Kconfig.soc_wifi_caps.in

@@ -18,8 +18,8 @@ extern "C" {
 
 #if CONFIG_SLAVE_IDF_TARGET_ESP32C2
 #define ESP_WIFI_MAX_CONN_NUM  (4)        /**< max number of stations which can connect to ESP32C2 soft-AP */
-#elif CONFIG_SLAVE_IDF_TARGET_ESP32C3 || CONFIG_SLAVE_IDF_TARGET_ESP32C6 || CONFIG_SLAVE_IDF_TARGET_ESP32C5
-#define ESP_WIFI_MAX_CONN_NUM  (10)       /**< max number of stations which can connect to ESP32C3 soft-AP */
+#elif CONFIG_SLAVE_IDF_TARGET_ESP32C3 || CONFIG_SLAVE_IDF_TARGET_ESP32C6 || CONFIG_SLAVE_IDF_TARGET_ESP32C5 || CONFIG_SLAVE_IDF_TARGET_ESP32C61
+#define ESP_WIFI_MAX_CONN_NUM  (10)       /**< max number of stations which can connect to ESP32C3/ESP32C6/ESP32C5/ESP32C61 soft-AP */
 #else
 #define ESP_WIFI_MAX_CONN_NUM  (15)       /**< max number of stations which can connect to ESP32/ESP32S3/ESP32S2 soft-AP */
 #endif