From f2b38ca41a553d98bf765b90ddbbd4acc7e27f85 Mon Sep 17 00:00:00 2001 From: LBussy Date: Tue, 9 Aug 2022 11:00:30 -0500 Subject: [PATCH] Fix main class in examples --- examples/Basic/Basic.ino | 2 +- .../AutoConnectWithFSParameters.ino | 20 +++++++++---------- ...AutoConnectWithFSParametersAndCustomIP.ino | 20 +++++++++---------- .../OnDemandConfigPortal.ino | 8 ++++---- examples/Unique/cb/AnonymousCB.ino | 12 +++++------ src/strings_en.h | 6 +++--- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/Basic/Basic.ino b/examples/Basic/Basic.ino index e481e00d2..bfe257824 100644 --- a/examples/Basic/Basic.ino +++ b/examples/Basic/Basic.ino @@ -12,7 +12,7 @@ void setup() { // put your setup code here, to run once: Serial.begin(115200); - //WiFiManager, Local intialization. Once its business is done, there is no need to keep it around + //AsyncWiFiManager, Local intialization. Once its business is done, there is no need to keep it around AsyncWiFiManager wm; // reset settings - wipe stored credentials for testing diff --git a/examples/Parameters/SPIFFS/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino b/examples/Parameters/SPIFFS/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino index c4fb0acd6..4c8ab94a4 100644 --- a/examples/Parameters/SPIFFS/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino +++ b/examples/Parameters/SPIFFS/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino @@ -81,36 +81,36 @@ void setup() { //AsyncWiFiManager //Local intialization. Once its business is done, there is no need to keep it around - AsyncWiFiManager wifiManager; + AsyncWiFiManager wm; //set config save notify callback - wifiManager.setSaveConfigCallback(saveConfigCallback); + wm.setSaveConfigCallback(saveConfigCallback); //set static ip - wifiManager.setSTAStaticIPConfig(IPAddress(10, 0, 1, 99), IPAddress(10, 0, 1, 1), IPAddress(255, 255, 255, 0)); + wm.setSTAStaticIPConfig(IPAddress(10, 0, 1, 99), IPAddress(10, 0, 1, 1), IPAddress(255, 255, 255, 0)); //add all your parameters here - wifiManager.addParameter(&custom_mqtt_server); - wifiManager.addParameter(&custom_mqtt_port); - wifiManager.addParameter(&custom_api_token); + wm.addParameter(&custom_mqtt_server); + wm.addParameter(&custom_mqtt_port); + wm.addParameter(&custom_api_token); //reset settings - for testing - //wifiManager.resetSettings(); + //wm.resetSettings(); //set minimu quality of signal so it ignores AP's under that quality //defaults to 8% - //wifiManager.setMinimumSignalQuality(); + //wm.setMinimumSignalQuality(); //sets timeout until configuration portal gets turned off //useful to make it all retry or go to sleep //in seconds - //wifiManager.setTimeout(120); + //wm.setTimeout(120); //fetches ssid and pass and tries to connect //if it does not connect it starts an access point with the specified name //here "AutoConnectAP" //and goes into a blocking loop awaiting configuration - if (!wifiManager.autoConnect("AutoConnectAP", "password")) { + if (!wm.autoConnect("AutoConnectAP", "password")) { Serial.println("failed to connect and hit timeout"); delay(3000); //reset and try again, or maybe put it to deep sleep diff --git a/examples/Parameters/SPIFFS/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino b/examples/Parameters/SPIFFS/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino index e0caece53..c759ab01a 100644 --- a/examples/Parameters/SPIFFS/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino +++ b/examples/Parameters/SPIFFS/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino @@ -100,10 +100,10 @@ void setup() { //AsyncWiFiManager //Local intialization. Once its business is done, there is no need to keep it around - AsyncWiFiManager wifiManager; + AsyncWiFiManager wm; //set config save notify callback - wifiManager.setSaveConfigCallback(saveConfigCallback); + wm.setSaveConfigCallback(saveConfigCallback); //set static ip IPAddress _ip, _gw, _sn; @@ -111,30 +111,30 @@ void setup() { _gw.fromString(static_gw); _sn.fromString(static_sn); - wifiManager.setSTAStaticIPConfig(_ip, _gw, _sn); + wm.setSTAStaticIPConfig(_ip, _gw, _sn); //add all your parameters here - wifiManager.addParameter(&custom_mqtt_server); - wifiManager.addParameter(&custom_mqtt_port); - wifiManager.addParameter(&custom_api_token); + wm.addParameter(&custom_mqtt_server); + wm.addParameter(&custom_mqtt_port); + wm.addParameter(&custom_api_token); //reset settings - for testing - //wifiManager.resetSettings(); + //wm.resetSettings(); //set minimu quality of signal so it ignores AP's under that quality //defaults to 8% - wifiManager.setMinimumSignalQuality(); + wm.setMinimumSignalQuality(); //sets timeout until configuration portal gets turned off //useful to make it all retry or go to sleep //in seconds - //wifiManager.setTimeout(120); + //wm.setTimeout(120); //fetches ssid and pass and tries to connect //if it does not connect it starts an access point with the specified name //here "AutoConnectAP" //and goes into a blocking loop awaiting configuration - if (!wifiManager.autoConnect("AutoConnectAP", "password")) { + if (!wm.autoConnect("AutoConnectAP", "password")) { Serial.println("failed to connect and hit timeout"); delay(3000); //reset and try again, or maybe put it to deep sleep diff --git a/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino index 00027b5cf..82b4b3c8a 100644 --- a/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino +++ b/examples/Super/OnDemandConfigPortal/OnDemandConfigPortal.ino @@ -19,7 +19,7 @@ const char* modes[] = { "NULL", "STA", "AP", "STA+AP" }; unsigned long mtime = 0; -WiFiManager wm; +AsyncWiFiManager wm; // TEST OPTION FLAGS @@ -37,7 +37,7 @@ bool WMISBLOCKING = true; // use blocking or non blocking mode, non global pa //callbacks // called after AP mode and config portal has started - // setAPCallback( std::function func ); + // setAPCallback( std::function func ); // called after webserver has started // setWebServerCallback( std::function func ); // called when settings reset have been triggered @@ -55,8 +55,8 @@ void saveWifiCallback(){ Serial.println("[CALLBACK] saveCallback fired"); } -//gets called when WiFiManager enters configuration mode -void configModeCallback (WiFiManager *myWiFiManager) { +//gets called when AsyncWiFiManager enters configuration mode +void configModeCallback (AsyncWiFiManager *myWiFiManager) { Serial.println("[CALLBACK] configModeCallback fired"); // myWiFiManager->setAPStaticIPConfig(IPAddress(10,0,1,1), IPAddress(10,0,1,1), IPAddress(255,255,255,0)); // Serial.println(WiFi.softAPIP()); diff --git a/examples/Unique/cb/AnonymousCB.ino b/examples/Unique/cb/AnonymousCB.ino index e380ea072..f19b399e6 100644 --- a/examples/Unique/cb/AnonymousCB.ino +++ b/examples/Unique/cb/AnonymousCB.ino @@ -4,17 +4,17 @@ bool _enteredConfigMode = false; void setup(){ Serial.begin(115200); - WiFiManager wifiManager; + AsyncWiFiManager wm; - // wifiManager.setAPCallback([this](WiFiManager* wifiManager) { - wifiManager.setAPCallback([&](WiFiManager* wifiManager) { + // wm.setAPCallback([this](AsyncWiFiManager* wm) { + wm.setAPCallback([&](AsyncWiFiManager* wm) { Serial.printf("Entered config mode:ip=%s, ssid='%s'\n", WiFi.softAPIP().toString().c_str(), - wifiManager->getConfigPortalSSID().c_str()); + wm->getConfigPortalSSID().c_str()); _enteredConfigMode = true; }); - wifiManager.resetSettings(); - if (!wifiManager.autoConnect()) { + wm.resetSettings(); + if (!wm.autoConnect()) { Serial.printf("*** Failed to connect and hit timeout\n"); ESP.restart(); delay(1000); diff --git a/src/strings_en.h b/src/strings_en.h index f3776a71f..f91d8d714 100644 --- a/src/strings_en.h +++ b/src/strings_en.h @@ -36,7 +36,7 @@ const char HTTP_SCRIPT[] PROGMEM = "