From 7137082e74a2f697f36b09031df1d97b7b2ce461 Mon Sep 17 00:00:00 2001 From: Alberto Ricci Bitti Date: Sat, 9 Jan 2016 17:50:09 +0100 Subject: [PATCH 1/3] Removed redundant #include --- examples/OnDemandConfigPortal/OnDemandConfigPortal.ino | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino index 06b7677..8c32b14 100644 --- a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino +++ b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino @@ -1,8 +1,6 @@ #include //https://github.com/esp8266/Arduino //needed for library -#include -#include #include //https://github.com/tzapu/WiFiManager From 687dc20f3ebb1cef69f9b5ed8ebceb13b055dfd8 Mon Sep 17 00:00:00 2001 From: Alberto Ricci Bitti Date: Sat, 9 Jan 2016 18:52:42 +0100 Subject: [PATCH 2/3] Changed to make it work on ESP-01 boards (on ESP-01 pin cannot be checked at setup as its only available pins, gpio0 and gpio2, are shared with the bootloader) - moved triggering of configuration portal into Arduino's loop() function - changed pin from 4 to 0 (and made it #define-able) --- .../OnDemandConfigPortal.ino | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino index 8c32b14..5a801f6 100644 --- a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino +++ b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino @@ -3,6 +3,10 @@ //needed for library #include //https://github.com/tzapu/WiFiManager +// select wich pin will trigger the configuraton portal when set to LOW +// ESP-01 users please note: the only pins available (0 and 2), are shared +// with the bootloader, so always set them HIGH at power-up +#define TRIGGER_PIN 0 //callback notifying us of the need to save config void saveConfigCallback () { @@ -15,12 +19,13 @@ void setup() { Serial.begin(115200); Serial.println("\n Starting"); - //read gpio 4 state on startup - pinMode(4, INPUT); - int pinState = digitalRead(4); + pinMode(TRIGGER_PIN, INPUT); +} - //if gpio 4 is high startup config mode - if (pinState == LOW) { + +void loop() { + // is configuration portal requested? + if ( digitalRead(TRIGGER_PIN) == LOW ) { //WiFiManager //Local intialization. Once its business is done, there is no need to keep it around WiFiManager wifiManager; @@ -56,10 +61,6 @@ void setup() { } -} - -void loop() { // put your main code here, to run repeatedly: - } From 5587532f01a8fe1ea2ee699a0e77a7d2c7198233 Mon Sep 17 00:00:00 2001 From: Alberto Ricci Bitti Date: Sat, 9 Jan 2016 20:11:04 +0100 Subject: [PATCH 3/3] Manually reverted to current tzapu/master after messing with git commits --- WiFiManager.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index ae2a525..6243869 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -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,14 +128,17 @@ 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 dnsServer->processNextRequest(); @@ -169,7 +170,7 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo server.reset(); dnsServer.reset(); - + DEBUG_WM("end loop"); return WiFi.status() == WL_CONNECTED; } @@ -205,6 +206,10 @@ String WiFiManager::getPassword() { return _pass; } +String WiFiManager::getConfigPortalSSID() { + 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;