proposal for issue esp8266#1845 wifi_wps_status_cb get an undefined status 4 and missed wifi_wps_disable (esp8266#2312)

jbheren · igrr · commit db5e20f23770 · 2016-08-01T11:46:29.000+08:00
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
@@ -590,6 +590,12 @@ void wifi_wps_status_cb(wps_cb_status status) {
         case WPS_CB_ST_WEP:
             DEBUGV("wps WEP\n");
             break;
+        case WPS_CB_ST_UNK:
+            DEBUGV("wps UNKNOWN\n");
+            if(!wifi_wps_disable()) {
+                DEBUGV("wps disable failed\n");
+            }
+            break;
     }
     // TODO user function to get status
 
@@ -670,4 +676,3 @@ void ESP8266WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
         WiFi.stopSmartConfig();
     }
 }
-
diff --git a/tools/sdk/include/user_interface.h b/tools/sdk/include/user_interface.h
@@ -481,6 +481,7 @@ enum wps_cb_status {
 	WPS_CB_ST_FAILED,
 	WPS_CB_ST_TIMEOUT,
 	WPS_CB_ST_WEP,
+	WPS_CB_ST_UNK,
 };
 
 bool wifi_wps_enable(WPS_TYPE_t wps_type);

Original file line number	Diff line number	Diff line change
`@@ -590,6 +590,12 @@ void wifi_wps_status_cb(wps_cb_status status) {`
`590`	`590`	`case WPS_CB_ST_WEP:`
`591`	`591`	`DEBUGV("wps WEP\n");`
`592`	`592`	`break;`
	`593`	`+ case WPS_CB_ST_UNK:`
	`594`	`+ DEBUGV("wps UNKNOWN\n");`
	`595`	`+ if(!wifi_wps_disable()) {`
	`596`	`+ DEBUGV("wps disable failed\n");`
	`597`	`+ }`
	`598`	`+ break;`
`593`	`599`	`}`
`594`	`600`	`// TODO user function to get status`
`595`	`601`
`@@ -670,4 +676,3 @@ void ESP8266WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {`
`670`	`676`	`WiFi.stopSmartConfig();`
`671`	`677`	`}`
`672`	`678`	`}`
`673`		`-`