From f17f57b48df6c0efda06bc853d0b215e8a66b42c Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 30 Sep 2016 13:48:37 +0800 Subject: [PATCH 1/3] esp32: remove esp_wps.h not support now --- components/esp32/include/esp_wps.h | 131 ----------------------------- 1 file changed, 131 deletions(-) delete mode 100644 components/esp32/include/esp_wps.h diff --git a/components/esp32/include/esp_wps.h b/components/esp32/include/esp_wps.h deleted file mode 100644 index b37fe542e..000000000 --- a/components/esp32/include/esp_wps.h +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright 2015-2016 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_WPS_H__ -#define __ESP_WPS_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** \defgroup WiFi_APIs WiFi Related APIs - * @brief WiFi APIs - */ - -/** @addtogroup WiFi_APIs - * @{ - */ - -/** \defgroup WPS_APIs WPS APIs - * @brief ESP32 WPS APIs - * - * WPS can only be used when ESP32 station is enabled. - * - */ - -/** @addtogroup WPS_APIs - * @{ - */ - -typedef enum wps_type { - WPS_TYPE_DISABLE = 0, - WPS_TYPE_PBC, - WPS_TYPE_PIN, - WPS_TYPE_DISPLAY, - WPS_TYPE_MAX, -} WPS_TYPE_t; - -enum wps_cb_status { - WPS_CB_ST_SUCCESS = 0, /**< WPS succeed */ - WPS_CB_ST_FAILED, /**< WPS fail */ - WPS_CB_ST_TIMEOUT, /**< WPS timeout, fail */ - WPS_CB_ST_WEP, /**< WPS failed because that WEP is not supported */ - WPS_CB_ST_SCAN_ERR, /**< can not find the target WPS AP */ -}; - -/** - * @brief Enable Wi-Fi WPS function. - * - * @attention WPS can only be used when ESP32 station is enabled. - * - * @param WPS_TYPE_t wps_type : WPS type, so far only WPS_TYPE_PBC is supported - * - * @return true : succeed - * @return false : fail - */ -bool wifi_wps_enable(WPS_TYPE_t wps_type); - -/** - * @brief Disable Wi-Fi WPS function and release resource it taken. - * - * @param null - * - * @return true : succeed - * @return false : fail - */ -bool wifi_wps_disable(void); - -/** - * @brief WPS starts to work. - * - * @attention WPS can only be used when ESP32 station is enabled. - * - * @param null - * - * @return true : WPS starts to work successfully, but does not mean WPS succeed. - * @return false : fail - */ -bool wifi_wps_start(void); - -/** - * @brief WPS callback. - * - * @param int status : status of WPS, enum wps_cb_status. - * - If parameter status == WPS_CB_ST_SUCCESS in WPS callback, it means WPS got AP's - * information, user can call wifi_wps_disable to disable WPS and release resource, - * then call wifi_station_connect to connect to target AP. - * - Otherwise, it means that WPS fail, user can create a timer to retry WPS by - * wifi_wps_start after a while, or call wifi_wps_disable to disable WPS and release resource. - * - * @return null - */ -typedef void (*wps_st_cb_t)(int status); - -/** - * @brief Set WPS callback. - * - * @attention WPS can only be used when ESP32 station is enabled. - * - * @param wps_st_cb_t cb : callback. - * - * @return true : WPS starts to work successfully, but does not mean WPS succeed. - * @return false : fail - */ -bool wifi_set_wps_cb(wps_st_cb_t cb); - -/** - * @} - */ - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /* __ESP_WPS_H__ */ From e3f46f424c1c4c64f8119d570f1fc764b68b1114 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 30 Sep 2016 13:50:11 +0800 Subject: [PATCH 2/3] esp32/lib: update wifi lib to a1e5f8b9 1. update smartconfig 2.6.2; 2. add watch dog 3. remove libwpa2.a/libwps.a --- components/esp32/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/lib b/components/esp32/lib index 3853d7ae3..a1e5f8b95 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit 3853d7ae3dd455492ff4ed663662d42d28c817e4 +Subproject commit a1e5f8b953c7934677ba7a6ed0a6dd2da0e6bd0f From 6827f27b99e63cf5b8588b996645a1b180029f26 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 30 Sep 2016 14:04:03 +0800 Subject: [PATCH 3/3] esp32: not link wps --- components/esp32/component.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/component.mk b/components/esp32/component.mk index 223c955d5..ca91059f7 100644 --- a/components/esp32/component.mk +++ b/components/esp32/component.mk @@ -10,7 +10,7 @@ COMPONENT_SRCDIRS := . hwcrypto -LIBS := crypto core net80211 phy rtc pp wpa wps +LIBS := crypto core net80211 phy rtc pp wpa LINKER_SCRIPTS += -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld