From bf37f8a03c2254a34ff1a80c7bc4e13006426be3 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Mon, 4 Nov 2019 15:02:19 +0800 Subject: [PATCH] 1. modify esp_wifi.h to support esp_netif feature 2. fix the bug for API_CHECK_ENABLE --- components/esp_wifi/include/esp_wifi.h | 3 ++- components/esp_wifi/include/esp_wifi_default.h | 18 ++++++++++++++++++ components/esp_wifi/lib | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 components/esp_wifi/include/esp_wifi_default.h diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h index 969aa62d9..d638c9b3a 100644 --- a/components/esp_wifi/include/esp_wifi.h +++ b/components/esp_wifi/include/esp_wifi.h @@ -63,6 +63,7 @@ #include "esp_wifi_types.h" #include "esp_event.h" #include "esp_private/esp_wifi_private.h" +#include "esp_wifi_default.h" #ifdef __cplusplus extern "C" { @@ -543,7 +544,7 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw); * @brief Set primary/secondary channel of ESP32 * * @attention 1. This is a special API for sniffer - * @attention 2. This API should be called after esp_wifi_start() or esp_wifi_set_promiscuous() + * @attention 2. This API should be called after esp_wifi_start() and esp_wifi_set_promiscuous() * * @param primary for HT20, primary is the channel number, for HT40, primary is the primary channel * @param second for HT20, second is ignored, for HT40, second is the second channel diff --git a/components/esp_wifi/include/esp_wifi_default.h b/components/esp_wifi/include/esp_wifi_default.h new file mode 100644 index 000000000..9d27c87a2 --- /dev/null +++ b/components/esp_wifi/include/esp_wifi_default.h @@ -0,0 +1,18 @@ +// Copyright 2019 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef _ESP_WIFI_DEFAULT_H +#define _ESP_WIFI_DEFAULT_H + +#endif //_ESP_WIFI_DEFAULT_H diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 778f38bb1..99eb8ac56 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 778f38bb132392057cef82139e19229bd200c89f +Subproject commit 99eb8ac56fe651e7116744e1704e02d0d2828d88