Added method getConfigurationSSID(), so the config portal SSID that is created by the ESP8266 can be used in the callback (e.g. for output to a screen)

This commit is contained in:
Franklin van Velthuizen
2016-01-09 01:17:16 +01:00
parent b05dff34b7
commit 1db01f08e6
2 changed files with 13 additions and 6 deletions
+9 -5
View File
@@ -49,13 +49,11 @@ void WiFiManager::addParameter(WiFiManagerParameter *p) {
DEBUG_WM(p->getID());
}
void WiFiManager::setupConfigPortal(char const *apName, char const *apPassword) {
void WiFiManager::setupConfigPortal() {
dnsServer.reset(new DNSServer());
server.reset(new ESP8266WebServer(80));
DEBUG_WM(F(""));
_apName = apName;
_apPassword = apPassword;
start = millis();
DEBUG_WM(F("Configuring access point... "));
@@ -130,13 +128,16 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo
//setup AP
WiFi.mode(WIFI_AP);
_apName = apName;
_apPassword = apPassword;
//notify we entered AP mode
if ( _apcallback != NULL) {
_apcallback();
}
connect = false;
setupConfigPortal(apName, apPassword);
setupConfigPortal();
DEBUG_WM("start loop");
while (timeout == 0 || millis() < start + timeout) {
//DNS
@@ -205,6 +206,10 @@ String WiFiManager::getPassword() {
return _pass;
}
String WiFiManager::getConfigurationSSID() {
return _apName;
}
String WiFiManager::urldecode(const char *src)
{
String decoded = "";
@@ -477,7 +482,6 @@ void WiFiManager::DEBUG_WM(Generic text) {
}
}
int WiFiManager::getRSSIasQuality(int RSSI) {
int quality = 0;
+4 -1
View File
@@ -67,6 +67,9 @@ class WiFiManager
String getSSID();
String getPassword();
// get the AP name of the config portal, so it can be used in the callback
String getConfigurationSSID();
void resetSettings();
//for convenience
String urldecode(const char*);
@@ -96,7 +99,7 @@ class WiFiManager
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(char const *apName, char const *apPassword);
void setupConfigPortal();
int _eepromStart;
const char* _apName = "no-net";