Merge branch 'bugfix/fix_the_bug_for_API_CHECK_ENABLED' into 'master'

esp_wifi: fix the bug for API_CHECK_ENABLE

See merge request espressif/esp-idf!6583
pull/4345/head
Jiang Jiang Jian 2019-11-06 23:42:41 +08:00
commit bda386c51a
3 zmienionych plików z 21 dodań i 2 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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

@ -1 +1 @@
Subproject commit 778f38bb132392057cef82139e19229bd200c89f
Subproject commit 99eb8ac56fe651e7116744e1704e02d0d2828d88