Merge branch 'feature/support_enrollee_feature_in_APSTA_mode' into 'master'

jack0c · jack0c · commit 21099c10f4eb · 2018-03-30T16:14:43.000+08:00
feature/support WPS enrollee in APSTA mode

See merge request idf/esp-idf!2120
diff --git a/components/esp32/lib b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 92b57f9c97e1554d8f45c1f8afdca29205dcd1be
+Subproject commit c47bfa9e70fda83d969aaf8bee28cb5714eb1b11
diff --git a/examples/wifi/wps/README.md b/examples/wifi/wps/README.md
@@ -1,8 +1,8 @@
 # Wifi WPS Example
 
-This example shows how to use wps in esp32.
+This example shows how to use wps enrollee in esp32.
 
-The wps only works in station mode now.
+Now we support to use enrollee feature in STA and APSTA mode.
 
 * PBC_MODE: Start esp32 and press the wps button on router, Then esp32 will get the ssid&password by wps PBC mode.
 
