From 835186b3b97086fecfee50e11cba2dffeaaee179 Mon Sep 17 00:00:00 2001 From: ChenJianxing Date: Mon, 1 Jun 2020 16:06:17 +0800 Subject: [PATCH 1/4] esp_wifi: re-enable build wifi example --- examples/wifi/espnow/README.md | 3 --- examples/wifi/iperf/README.md | 3 --- examples/wifi/simple_sniffer/README.md | 3 --- 3 files changed, 9 deletions(-) diff --git a/examples/wifi/espnow/README.md b/examples/wifi/espnow/README.md index 19ca66f33..db07648a6 100644 --- a/examples/wifi/espnow/README.md +++ b/examples/wifi/espnow/README.md @@ -1,6 +1,3 @@ -| Supported Targets | ESP32 | -| ----------------- | ----- | - # ESPNOW Example (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md index ffe84e43b..ce7247f05 100644 --- a/examples/wifi/iperf/README.md +++ b/examples/wifi/iperf/README.md @@ -1,6 +1,3 @@ -| Supported Targets | ESP32 | -| ----------------- | ----- | - # Iperf Example ## Note about iperf version diff --git a/examples/wifi/simple_sniffer/README.md b/examples/wifi/simple_sniffer/README.md index a54076633..7c8ba2d4a 100644 --- a/examples/wifi/simple_sniffer/README.md +++ b/examples/wifi/simple_sniffer/README.md @@ -1,6 +1,3 @@ -| Supported Targets | ESP32 | -| ----------------- | ----- | - # Simple Sniffer Example (See the README.md file in the upper level 'examples' directory for more information about examples.) From ba67a9518e6dbc0ceb0aeaf17096591b84f29994 Mon Sep 17 00:00:00 2001 From: ChenJianxing Date: Mon, 1 Jun 2020 17:06:28 +0800 Subject: [PATCH 2/4] fix esp32s2 do not have crc*_be func --- components/esp_common/include/esp_crc.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/components/esp_common/include/esp_crc.h b/components/esp_common/include/esp_crc.h index 23a04876a..cc14c6ace 100644 --- a/components/esp_common/include/esp_crc.h +++ b/components/esp_common/include/esp_crc.h @@ -24,6 +24,10 @@ extern "C" { #include "esp32/rom/crc.h" #endif +#if defined(CONFIG_IDF_TARGET_ESP32S2) +#include "esp32s2/rom/crc.h" +#endif + /******************* Polynomials Used in the CRC APIs **************************** * CRC-8 x8+x2+x1+1 0x07 * CRC16-CCITT x16+x12+x5+1 0x1021 @@ -43,6 +47,7 @@ static inline uint32_t esp_crc32_le(uint32_t crc, uint8_t const *buf, uint32_t l return crc32_le(crc, buf, len); } +#if defined(CONFIG_IDF_TARGET_ESP32) /** * @brief CRC32 value in big endian. * @@ -55,6 +60,7 @@ static inline uint32_t esp_crc32_be(uint32_t crc, uint8_t const *buf, uint32_t l { return crc32_be(crc, buf, len); } +#endif /** * @brief CRC16 value in little endian. @@ -69,6 +75,7 @@ static inline uint16_t esp_crc16_le(uint16_t crc, uint8_t const *buf, uint32_t l return crc16_le(crc, buf, len); } +#if defined(CONFIG_IDF_TARGET_ESP32) /** * @brief CRC16 value in big endian. * @@ -81,6 +88,7 @@ static inline uint16_t esp_crc16_be(uint16_t crc, uint8_t const *buf, uint32_t l { return crc16_be(crc, buf, len); } +#endif /** * @brief CRC8 value in little endian. @@ -95,6 +103,7 @@ static inline uint8_t esp_crc8_le(uint8_t crc, uint8_t const *buf, uint32_t len) return crc8_le(crc, buf, len); } +#if defined(CONFIG_IDF_TARGET_ESP32) /** * @brief CRC8 value in big endian. * @@ -107,6 +116,7 @@ static inline uint8_t esp_crc8_be(uint8_t crc, uint8_t const *buf, uint32_t len) { return crc8_be(crc, buf, len); } +#endif #ifdef __cplusplus } From 7cbb970b5008ffac26b79af6813d8e41a3205c44 Mon Sep 17 00:00:00 2001 From: ChenJianxing Date: Mon, 1 Jun 2020 20:08:20 +0800 Subject: [PATCH 3/4] esp32s2: disable sdmmc api --- examples/wifi/simple_sniffer/main/Kconfig.projbuild | 3 ++- .../wifi/simple_sniffer/main/simple_sniffer_example_main.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/wifi/simple_sniffer/main/Kconfig.projbuild b/examples/wifi/simple_sniffer/main/Kconfig.projbuild index c85abc650..1de70f187 100644 --- a/examples/wifi/simple_sniffer/main/Kconfig.projbuild +++ b/examples/wifi/simple_sniffer/main/Kconfig.projbuild @@ -9,7 +9,8 @@ menu "Example Configuration" choice SNIFFER_PCAP_DESTINATION prompt "Select destination to store pcap file" - default SNIFFER_PCAP_DESTINATION_SD + default SNIFFER_PCAP_DESTINATION_SD if IDF_TARGET_ESP32 + default SNIFFER_PCAP_DESTINATION_JTAG if IDF_TARGET_ESP32S2 help Select where to store the pcap file. Currently support storing files to SD card or to host via JTAG interface. diff --git a/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c b/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c index a842abe83..2853a4be8 100644 --- a/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c +++ b/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c @@ -19,8 +19,10 @@ #include "esp_wifi.h" #include "esp_err.h" #include "esp_log.h" +#if CONFIG_SNIFFER_PCAP_DESTINATION_SD #include "driver/sdmmc_host.h" #include "driver/sdspi_host.h" +#endif #include "nvs_flash.h" #include "sdmmc_cmd.h" #include "cmd_system.h" From f5a6ae7e93bd2901e970a1a8773898cfe5fc2322 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Wed, 17 Jun 2020 14:55:45 +0800 Subject: [PATCH 4/4] esp_wifi: 1. Fix WPA3 Auth timeout during BLE coex 2. fix addba ssn and send bar for first ampdu 3. fix the bug that airkiss find hidden AP fail 4. update mesh lib 5. fix interrupt handle param variable error --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index d2c242d4a..efee8ef3a 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit d2c242d4a5d2fe2099dc8453df2c5b31297d7ff7 +Subproject commit efee8ef3ae0070c802676ad8b87dc2243159686d