]> granicus.if.org Git - esp-idf/commitdiff
Merge branch bugfix/wps_receive_m2d_fail_process to master
authorDeng Xin <dengxin@espressif.com>
Tue, 13 Jun 2017 11:37:22 +0000 (19:37 +0800)
committerDeng Xin <dengxin@espressif.com>
Tue, 13 Jun 2017 13:48:48 +0000 (21:48 +0800)
ESP32: Add error wps fail reason enum in esp_event.h
see merge request !226

components/esp32/include/esp_event.h
components/esp32/lib

index 8e6e1833d48194747b8ced168d4f1721804b6963..7b3a85732f63f243c4b961907205dc3a71446d2d 100644 (file)
@@ -53,6 +53,11 @@ typedef enum {
     SYSTEM_EVENT_MAX
 } system_event_id_t;
 
+typedef enum {
+    WPS_FAIL_REASON_NORMAL = 0,                   /**< ESP32 WPS normal fail reason */
+    WPS_FAIL_REASON_RECV_M2D,                       /**< ESP32 WPS receive M2D frame */
+    WPS_FAIL_REASON_MAX
+}system_event_sta_wps_fail_reason_t;
 typedef struct {
     uint32_t status;          /**< status of scanning APs */
     uint8_t  number;
@@ -113,6 +118,7 @@ typedef union {
     system_event_sta_authmode_change_t         auth_change;        /**< the auth mode of AP ESP32 station connected to changed */
     system_event_sta_got_ip_t                  got_ip;             /**< ESP32 station got IP */
     system_event_sta_wps_er_pin_t              sta_er_pin;         /**< ESP32 station WPS enrollee mode PIN code received */
+    system_event_sta_wps_fail_reason_t         sta_er_fail_reason;/**< ESP32 station WPS enrollee mode failed reason code received */
     system_event_ap_staconnected_t             sta_connected;      /**< a station connected to ESP32 soft-AP */
     system_event_ap_stadisconnected_t          sta_disconnected;   /**< a station disconnected to ESP32 soft-AP */
     system_event_ap_probe_req_rx_t             ap_probereqrecved;  /**< ESP32 soft-AP receive probe request packet */
index 0ce499fcdf9b80f769887e4271ee373538cdd633..c30fbaf1ea70944db76894d670c9459097873dc0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0ce499fcdf9b80f769887e4271ee373538cdd633
+Subproject commit c30fbaf1ea70944db76894d670c9459097873dc0