Преглед изворни кода

Merge pull request #34 from HamzaHajeir/HamzaHajeir-patch-2

Fixed WPS issue
Alan Steremberg пре 6 година
родитељ
комит
5ef55f36ee
2 измењених фајлова са 8 додато и 4 уклоњено
  1. 4 2
      ESPAsyncWiFiManager.cpp
  2. 4 2
      ESPAsyncWiFiManager.h

+ 4 - 2
ESPAsyncWiFiManager.cpp

@@ -548,12 +548,13 @@ int AsyncWiFiManager::connectWifi(String ssid, String pass) {
   DEBUG_WM ("Connection result: ");
   DEBUG_WM ( connRes );
   //not connected, WPS enabled, no pass - first attempt
+#ifdef NO_EXTRA_4K_HEAP	
   if (_tryWPS && connRes != WL_CONNECTED && pass == "") {
     startWPS();
     //should be connected at the end of WPS
     connRes = waitForConnectResult();
   }
-
+#endif
   needInfo = true;
   setInfo();
   return connRes;
@@ -581,7 +582,7 @@ uint8_t AsyncWiFiManager::waitForConnectResult() {
     return status;
   }
 }
-
+#ifdef NO_EXTRA_4K_HEAP
 void AsyncWiFiManager::startWPS() {
   DEBUG_WM("START WPS");
 #if defined(ESP8266)
@@ -602,6 +603,7 @@ void AsyncWiFiManager::startWPS() {
   DEBUG_WM("END WPS");
 
 }
+#endif
 /*
 String AsyncWiFiManager::getSSID() {
 if (_ssid == "") {

+ 4 - 2
ESPAsyncWiFiManager.h

@@ -177,8 +177,9 @@ private:
   //const String  HTTP_HEAD = "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/><title>{v}</title>";
 
   void          setupConfigPortal();
+#ifdef NO_EXTRA_4K_HEAP
   void          startWPS();
-
+#endif
   String        pager;
   wl_status_t   wifiStatus;
   const char*   _apName                 = "no-net";
@@ -200,8 +201,9 @@ private:
   int           _minimumQuality         = -1;
   boolean       _removeDuplicateAPs     = true;
   boolean       _shouldBreakAfterConfig = false;
+#ifdef NO_EXTRA_4K_HEAP
   boolean       _tryWPS                 = false;
-
+#endif
   const char*   _customHeadElement      = "";
 
   //String        getEEPROMString(int start, int len);