Skip to content

Commit 1279776

Browse files
committed
fix(wifi_remote): Update headers and configs on supported versions
1 parent 6e981ff commit 1279776

33 files changed

+22356
-5281
lines changed

components/esp_wifi_remote/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ idf_component_register(INCLUDE_DIRS include
1414
PRIV_REQUIRES esp_wifi esp-tls vfs)
1515

1616

17-
set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
17+
set(IDF_VER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
1818

1919
# Check if we're on tagged version of ESP-IDF and if we need to supply specific version
2020
string(REGEX MATCH "^v[0-9]+\\.[0-9]+(\\.[0-9]+)?(-dirty)?$" IDF_VER_TAG "${IDF_VER}")
@@ -48,7 +48,7 @@ idf_component_get_property(wifi esp_wifi COMPONENT_LIB)
4848

4949
# Update wifi include directories to prepend the injected dir with modified headers supporting SLAVE capability
5050
get_target_property(original_wifi_dirs ${wifi} INTERFACE_INCLUDE_DIRECTORIES)
51-
set(updated_wifi_dirs "${CMAKE_CURRENT_SOURCE_DIR}/${IDF_VER_DIR}/include/injected" ${original_wifi_dirs})
51+
set(updated_wifi_dirs "${IDF_VER_DIR}/include/injected" ${original_wifi_dirs})
5252
set_target_properties(${wifi} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${updated_wifi_dirs}")
5353

5454
target_link_libraries(${wifi} PUBLIC ${COMPONENT_LIB})

components/esp_wifi_remote/idf_tag_v5.3.1/Kconfig.wifi.in

Lines changed: 718 additions & 718 deletions
Large diffs are not rendered by default.

components/esp_wifi_remote/idf_tag_v5.3.1/include/esp_wifi_default_config.h

Lines changed: 320 additions & 320 deletions
Large diffs are not rendered by default.

components/esp_wifi_remote/idf_tag_v5.3.1/include/injected/esp_wifi.h

Lines changed: 1650 additions & 0 deletions
Large diffs are not rendered by default.

components/esp_wifi_remote/idf_tag_v5.3.1/include/injected/esp_wifi_he_types.h

Lines changed: 434 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
#pragma once
7+
8+
#include "esp_wifi_types_generic.h"
9+
#if __has_include("esp_wifi_types_native.h")
10+
#include "esp_wifi_types_native.h"
11+
#else
12+
13+
#ifdef __cplusplus
14+
extern "C" {
15+
#endif
16+
17+
/*
18+
* In case we have no native types, we can still provide opaque structs,
19+
* so the most common APIs could work and others would compile.
20+
* This could happen for chipsets with no wifi, yet without local esp_wifi_remote.
21+
*/
22+
typedef struct wifi_csi_config_t wifi_csi_config_t;
23+
typedef struct wifi_pkt_rx_ctrl_t wifi_pkt_rx_ctrl_t;
24+
25+
#ifdef __cplusplus
26+
}
27+
#endif
28+
29+
#endif // __has_include("esp_wifi_types_native.h")

components/esp_wifi_remote/idf_tag_v5.3.1/include/injected/esp_wifi_types_generic.h

Lines changed: 1081 additions & 0 deletions
Large diffs are not rendered by default.

components/esp_wifi_remote/idf_tag_v5.3.2/Kconfig.wifi.in

Lines changed: 721 additions & 721 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)