Merge branch 'master' of https://github.com/tzapu/WiFiManager into loop

This commit is contained in:
david gauchard
2018-08-08 23:04:30 +02:00
5 changed files with 23 additions and 5 deletions
+4
View File
@@ -1,5 +1,9 @@
## PLEASE TRY DEVELOPMENT BRANCH before submitting bugs on release or master, in case they were already fixed. ##
## POST SERIAL OUTPUT !
## POST SERIAL OUTPUT !
## POST SERIAL OUTPUT !
Issues without basic info will be ignored or closed!
Please fill the info fields, it helps to get you faster support ;)
+16 -3
View File
@@ -197,9 +197,20 @@ boolean WiFiManager::startConfigPortal() {
}
boolean WiFiManager::startConfigPortal(char const *apName, char const *apPassword) {
//setup AP
WiFi.mode(WIFI_AP_STA);
DEBUG_WM(F("SET AP STA"));
if(!WiFi.isConnected()){
WiFi.persistent(false);
// disconnect sta, start ap
WiFi.disconnect(); // this alone is not enough to stop the autoconnecter
WiFi.mode(WIFI_AP);
WiFi.persistent(true);
}
else {
//setup AP
WiFi.mode(WIFI_AP_STA);
DEBUG_WM(F("SET AP STA"));
}
_apName = apName;
_apPassword = apPassword;
@@ -301,11 +312,13 @@ int WiFiManager::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
return connRes;
}
@@ -61,6 +61,7 @@ void setup() {
} else {
Serial.println("failed to load json config");
}
configFile.close();
}
}
} else {
+1 -1
View File
@@ -9,5 +9,5 @@
},
"frameworks": "arduino",
"platforms": "espressif8266",
"version": "0.12"
"version": "0.14"
}
+1 -1
View File
@@ -1,5 +1,5 @@
name=WiFiManager
version=0.12
version=0.14
author=tzapu
maintainer=tzapu
sentence=ESP8266 WiFi Connection manager with fallback web configuration portal