From 159674bbbafa544ef07c08654a34840230b609b1 Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Wed, 21 Feb 2018 14:50:42 +0100 Subject: [PATCH 01/12] allow user loop while in AP mode --- WiFiManager.cpp | 4 ++++ WiFiManager.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 1e6d805..a0d5948 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -252,6 +252,10 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo break; } } + + if (_loop) + _loop(); + yield(); } diff --git a/WiFiManager.h b/WiFiManager.h index 3da163e..7a18462 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -118,6 +118,8 @@ class WiFiManager //if this is true, remove duplicated Access Points - defaut true void setRemoveDuplicateAPs(boolean removeDuplicates); + void setUserLoopInAP (void (*loop)()) { _loop = loop; } + private: std::unique_ptr dnsServer; std::unique_ptr server; @@ -137,6 +139,7 @@ class WiFiManager unsigned long _configPortalTimeout = 0; unsigned long _connectTimeout = 0; unsigned long _configPortalStart = 0; + void (*_loop)() = 0; IPAddress _ap_static_ip; IPAddress _ap_static_gw; From f1e657e2b82bd90d259efd55cd70b82fde42aefd Mon Sep 17 00:00:00 2001 From: Norbert Date: Mon, 4 Jun 2018 13:51:29 +0200 Subject: [PATCH 02/12] Fixed Waiting for connection result with time out issue --- WiFiManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 1e6d805..cbf020c 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -319,7 +319,7 @@ uint8_t WiFiManager::waitForConnectResult() { keepConnecting = false; DEBUG_WM (F("Connection timed out")); } - if (status == WL_CONNECTED || status == WL_CONNECT_FAILED) { + if (status == WL_CONNECTED) { keepConnecting = false; } delay(100); From fd6bf74720dce747344e91ef2fe2ad39eec7457d Mon Sep 17 00:00:00 2001 From: "doncov.eugene" Date: Mon, 26 Nov 2018 17:03:20 +0300 Subject: [PATCH 03/12] separate charset and viewport meta --- WiFiManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WiFiManager.h b/WiFiManager.h index 64bb96e..92ec011 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -22,7 +22,7 @@ extern "C" { #include "user_interface.h" } -const char HTTP_HEAD[] PROGMEM = "{v}"; +const char HTTP_HEAD[] PROGMEM = "{v}"; const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_SCRIPT[] PROGMEM = ""; const char HTTP_HEAD_END[] PROGMEM = "
"; From f26638e38b049ea165bd4a9153c9dad4b382eaea Mon Sep 17 00:00:00 2001 From: David Gauchard Date: Fri, 30 Aug 2019 15:38:36 +0200 Subject: [PATCH 04/12] hotfix: rename internal HTTP_HEAD to HTTP_HEADER --- WiFiManager.cpp | 24 ++++++++++-------------- WiFiManager.h | 9 +++------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index dd56cca..93a70c1 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -263,10 +263,6 @@ boolean WiFiManager::startConfigPortal(char const *apName, char const *apPasswo break; } } - - if (_loop) - _loop(); - yield(); } @@ -424,12 +420,12 @@ void WiFiManager::handleRoot() { return; } - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER); page.replace("{v}", "Options"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += String(F("

")); page += _apName; page += String(F("

")); @@ -445,12 +441,12 @@ void WiFiManager::handleRoot() { /** Wifi config page handler */ void WiFiManager::handleWifi(boolean scan) { - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER); page.replace("{v}", "Config ESP"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); if (scan) { int n = WiFi.scanNetworks(); @@ -640,12 +636,12 @@ void WiFiManager::handleWifiSave() { optionalIPFromString(&_sta_static_sn, sn.c_str()); } - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER); page.replace("{v}", "Credentials Saved"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += FPSTR(HTTP_SAVED); page += FPSTR(HTTP_END); @@ -661,12 +657,12 @@ void WiFiManager::handleWifiSave() { void WiFiManager::handleInfo() { DEBUG_WM(F("Info")); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER); page.replace("{v}", "Info"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += F("
"); page += F("
Chip ID
"); page += ESP.getChipId(); @@ -702,12 +698,12 @@ void WiFiManager::handleInfo() { void WiFiManager::handleReset() { DEBUG_WM(F("Reset")); - String page = FPSTR(HTTP_HEAD); + String page = FPSTR(HTTP_HEADER); page.replace("{v}", "Info"); page += FPSTR(HTTP_SCRIPT); page += FPSTR(HTTP_STYLE); page += _customHeadElement; - page += FPSTR(HTTP_HEAD_END); + page += FPSTR(HTTP_HEADER_END); page += F("Module will reset in a few seconds."); page += FPSTR(HTTP_END); diff --git a/WiFiManager.h b/WiFiManager.h index d74a58f..259c1bd 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -22,10 +22,10 @@ extern "C" { #include "user_interface.h" } -const char HTTP_HEAD[] PROGMEM = "{v}"; +const char HTTP_HEADER[] PROGMEM = "{v}"; const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_SCRIPT[] PROGMEM = ""; -const char HTTP_HEAD_END[] PROGMEM = "
"; +const char HTTP_HEADER_END[] PROGMEM = "
"; const char HTTP_PORTAL_OPTIONS[] PROGMEM = "



"; const char HTTP_ITEM[] PROGMEM = "
{v} {r}%
"; const char HTTP_FORM_START[] PROGMEM = "


"; @@ -118,8 +118,6 @@ class WiFiManager //if this is true, remove duplicated Access Points - defaut true void setRemoveDuplicateAPs(boolean removeDuplicates); - void setUserLoopInAP (void (*loop)()) { _loop = loop; } - private: std::unique_ptr dnsServer; std::unique_ptr server; @@ -127,7 +125,7 @@ class WiFiManager //const int WM_DONE = 0; //const int WM_WAIT = 10; - //const String HTTP_HEAD = "{v}"; + //const String HTTP_HEADER = "{v}"; void setupConfigPortal(); void startWPS(); @@ -139,7 +137,6 @@ class WiFiManager unsigned long _configPortalTimeout = 0; unsigned long _connectTimeout = 0; unsigned long _configPortalStart = 0; - void (*_loop)() = 0; IPAddress _ap_static_ip; IPAddress _ap_static_gw; From 89eb952d18fe091d58efe105b42b924e91b88851 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Thu, 8 Nov 2018 12:20:01 -0600 Subject: [PATCH 05/12] hotfix #576 --- WiFiManager.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index d7e93c4..032baf4 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -143,18 +143,17 @@ void WiFiManager::setupConfigPortal() { dnsServer->start(DNS_PORT, "*", WiFi.softAPIP()); /* Setup web pages: root, wifi config pages, SO captive portal detectors and not found. */ - server->on(String(F("/")), std::bind(&WiFiManager::handleRoot, this)); - server->on(String(F("/wifi")), std::bind(&WiFiManager::handleWifi, this, true)); - server->on(String(F("/0wifi")), std::bind(&WiFiManager::handleWifi, this, false)); - server->on(String(F("/wifisave")), std::bind(&WiFiManager::handleWifiSave, this)); - server->on(String(F("/i")), std::bind(&WiFiManager::handleInfo, this)); - server->on(String(F("/r")), std::bind(&WiFiManager::handleReset, this)); + server->on(String(F("/")).c_str(), std::bind(&WiFiManager::handleRoot, this)); + server->on(String(F("/wifi")).c_str(), std::bind(&WiFiManager::handleWifi, this, true)); + server->on(String(F("/0wifi")).c_str(), std::bind(&WiFiManager::handleWifi, this, false)); + server->on(String(F("/wifisave")).c_str(), std::bind(&WiFiManager::handleWifiSave, this)); + server->on(String(F("/i")).c_str(), std::bind(&WiFiManager::handleInfo, this)); + server->on(String(F("/r")).c_str(), std::bind(&WiFiManager::handleReset, this)); //server->on("/generate_204", std::bind(&WiFiManager::handle204, this)); //Android/Chrome OS captive portal check. - server->on(String(F("/fwlink")), std::bind(&WiFiManager::handleRoot, this)); //Microsoft captive portal. Maybe not needed. Might be handled by notFound handler. + server->on(String(F("/fwlink")).c_str(), std::bind(&WiFiManager::handleRoot, this)); //Microsoft captive portal. Maybe not needed. Might be handled by notFound handler. server->onNotFound (std::bind(&WiFiManager::handleNotFound, this)); server->begin(); // Web server start DEBUG_WM(F("HTTP server started")); - } boolean WiFiManager::autoConnect() { From 8f9edd18a6273c19399ca303fb5e6a88c37bdef0 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 30 Aug 2019 09:19:20 -0500 Subject: [PATCH 06/12] fixes #708 --- WiFiManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 032baf4..107be63 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -290,7 +290,7 @@ int WiFiManager::connectWifi(String ssid, String pass) { if (ssid != "") { WiFi.begin(ssid.c_str(), pass.c_str()); } else { - if (WiFi.SSID()) { + if (WiFi.SSID() != "") { DEBUG_WM(F("Using last saved values, should be faster")); //trying to fix connection in progress hanging ETS_UART_INTR_DISABLE(); From d0e70fdd6b4be3ca07aa2650fd0bdf35b3c2bbd2 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 30 Aug 2019 09:36:44 -0500 Subject: [PATCH 07/12] fixes #336 --- WiFiManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 107be63..fcfcec7 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -282,7 +282,7 @@ int WiFiManager::connectWifi(String ssid, String pass) { DEBUG_WM(WiFi.localIP()); } //fix for auto connect racing issue - if (WiFi.status() == WL_CONNECTED) { + if (WiFi.status() == WL_CONNECTED && (WiFi.SSID() == ssid)) { DEBUG_WM(F("Already connected. Bailing out.")); return WL_CONNECTED; } From 2e7af253abc63fb9f21e1191185159840b7c7277 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 30 Aug 2019 09:44:20 -0500 Subject: [PATCH 08/12] V0.15-beta I think this works for library managers.. --- library.json | 2 +- library.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.json b/library.json index 8f0830a..c0030bd 100644 --- a/library.json +++ b/library.json @@ -9,5 +9,5 @@ }, "frameworks": "arduino", "platforms": "espressif8266", - "version": "0.14" + "version": "0.15-beta" } diff --git a/library.properties b/library.properties index e0420ad..0f3c3d7 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=WiFiManager -version=0.14 +version=0.15-beta author=tzapu maintainer=tzapu sentence=ESP8266 WiFi Connection manager with fallback web configuration portal From 368ea928f014be9c1616b1a94caf81a8971142ee Mon Sep 17 00:00:00 2001 From: tablatronix Date: Mon, 9 Sep 2019 08:46:45 -0500 Subject: [PATCH 09/12] arduino wont pickup this release trying a different format --- library.json | 2 +- library.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.json b/library.json index c0030bd..d8b1d5e 100644 --- a/library.json +++ b/library.json @@ -9,5 +9,5 @@ }, "frameworks": "arduino", "platforms": "espressif8266", - "version": "0.15-beta" + "version": "0.15.0-beta" } diff --git a/library.properties b/library.properties index 0f3c3d7..743922e 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=WiFiManager -version=0.15-beta +version=0.15.0-beta author=tzapu maintainer=tzapu sentence=ESP8266 WiFi Connection manager with fallback web configuration portal From 210b4c5d01b390c33ea193cc7bc0961ab1b3983b Mon Sep 17 00:00:00 2001 From: Ruan de Villiers Date: Tue, 14 Jan 2020 21:07:38 +0200 Subject: [PATCH 10/12] Updated AutoConnectWithFSParameters to toggle between ArduinoJson5 and ArduinoJson6 --- .../AutoConnectWithFSParameters.ino | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino index 7e6c373..f262901 100644 --- a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino +++ b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino @@ -1,7 +1,5 @@ #include //this needs to be first, or it all crashes and burns... - #include //https://github.com/esp8266/Arduino - //needed for library #include #include @@ -9,6 +7,9 @@ #include //https://github.com/bblanchon/ArduinoJson +//Comment out this line if you are still using ArduinoJsonV5 +#define UseJsonV6 + //define your default values here, if there are different values in config.json, they are overwritten. char mqtt_server[40]; char mqtt_port[6] = "8080"; @@ -23,7 +24,6 @@ void saveConfigCallback () { shouldSaveConfig = true; } - void setup() { // put your setup code here, to run once: Serial.begin(115200); @@ -48,16 +48,22 @@ void setup() { std::unique_ptr buf(new char[size]); configFile.readBytes(buf.get(), size); + +#ifdef UseJsonV6 + DynamicJsonDocument json(1024); + auto deserializeError = deserializeJson(json, buf.get()); + serializeJson(json, Serial); + if ( ! deserializeError ) { +#else DynamicJsonBuffer jsonBuffer; JsonObject& json = jsonBuffer.parseObject(buf.get()); json.printTo(Serial); if (json.success()) { +#endif Serial.println("\nparsed json"); - strcpy(mqtt_server, json["mqtt_server"]); strcpy(mqtt_port, json["mqtt_port"]); strcpy(blynk_token, json["blynk_token"]); - } else { Serial.println("failed to load json config"); } @@ -69,8 +75,6 @@ void setup() { } //end read - - // The extra parameters to be configured (can be either global or just in the setup) // After connecting, parameter.getValue() will get you the configured value // id/name placeholder/prompt default length @@ -86,8 +90,8 @@ void setup() { wifiManager.setSaveConfigCallback(saveConfigCallback); //set static ip - wifiManager.setSTAStaticIPConfig(IPAddress(10,0,1,99), IPAddress(10,0,1,1), IPAddress(255,255,255,0)); - + wifiManager.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); @@ -99,7 +103,7 @@ void setup() { //set minimu quality of signal so it ignores AP's under that quality //defaults to 8% //wifiManager.setMinimumSignalQuality(); - + //sets timeout until configuration portal gets turned off //useful to make it all retry or go to sleep //in seconds @@ -124,12 +128,20 @@ void setup() { strcpy(mqtt_server, custom_mqtt_server.getValue()); strcpy(mqtt_port, custom_mqtt_port.getValue()); strcpy(blynk_token, custom_blynk_token.getValue()); + Serial.println("The values in the file are: "); + Serial.println("\tmqtt_server : " + String(mqtt_server)); + Serial.println("\tmqtt_port : " + String(mqtt_port)); + Serial.println("\tblynk_token : " + String(blynk_token)); //save the custom parameters to FS if (shouldSaveConfig) { Serial.println("saving config"); +#ifdef UseJsonV6 + DynamicJsonDocument json(1024); +#else DynamicJsonBuffer jsonBuffer; JsonObject& json = jsonBuffer.createObject(); +#endif json["mqtt_server"] = mqtt_server; json["mqtt_port"] = mqtt_port; json["blynk_token"] = blynk_token; @@ -139,19 +151,22 @@ void setup() { Serial.println("failed to open config file for writing"); } +#ifdef UseJsonV6 + serializeJson(json, Serial); + serializeJson(json, configFile); +#else json.printTo(Serial); json.printTo(configFile); +#endif configFile.close(); //end save } Serial.println("local ip"); Serial.println(WiFi.localIP()); - } void loop() { // put your main code here, to run repeatedly: - } From 9669bfd1a3588852c715df4052d9aaa93f36efbe Mon Sep 17 00:00:00 2001 From: Ruan de Villiers Date: Tue, 14 Jan 2020 21:20:51 +0200 Subject: [PATCH 11/12] Added functionality to toggle between ArduinoJson 5 and 6 --- ...AutoConnectWithFSParametersAndCustomIP.ino | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino b/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino index 3f391ae..b29cfa7 100644 --- a/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino +++ b/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino @@ -9,11 +9,14 @@ #include //https://github.com/bblanchon/ArduinoJson +//Comment out this line if you are still using ArduinoJsonV5 +#define UseJsonV6 + //define your default values here, if there are different values in config.json, they are overwritten. -//length should be max size + 1 +//length should be max size + 1 char mqtt_server[40]; char mqtt_port[6] = "8080"; -char blynk_token[33] = "YOUR_BLYNK_TOKEN"; +char blynk_token[34] = "YOUR_BLYNK_TOKEN"; //default custom static IP char static_ip[16] = "10.0.1.56"; char static_gw[16] = "10.0.1.1"; @@ -52,29 +55,29 @@ void setup() { std::unique_ptr buf(new char[size]); configFile.readBytes(buf.get(), size); +#ifdef UseJsonV6 + DynamicJsonDocument json(1024); + auto deserializeError = deserializeJson(json, buf.get()); + serializeJson(json, Serial); + if ( ! deserializeError ) { +#else DynamicJsonBuffer jsonBuffer; JsonObject& json = jsonBuffer.parseObject(buf.get()); json.printTo(Serial); if (json.success()) { +#endif Serial.println("\nparsed json"); strcpy(mqtt_server, json["mqtt_server"]); strcpy(mqtt_port, json["mqtt_port"]); strcpy(blynk_token, json["blynk_token"]); - if(json["ip"]) { + if (json["ip"]) { Serial.println("setting custom ip from config"); - //static_ip = json["ip"]; strcpy(static_ip, json["ip"]); strcpy(static_gw, json["gateway"]); strcpy(static_sn, json["subnet"]); - //strcat(static_ip, json["ip"]); - //static_gw = json["gateway"]; - //static_sn = json["subnet"]; Serial.println(static_ip); -/* Serial.println("converting ip"); - IPAddress ip = ipFromCharArray(static_ip); - Serial.println(ip);*/ } else { Serial.println("no custom ip in config"); } @@ -107,13 +110,13 @@ void setup() { wifiManager.setSaveConfigCallback(saveConfigCallback); //set static ip - IPAddress _ip,_gw,_sn; + IPAddress _ip, _gw, _sn; _ip.fromString(static_ip); _gw.fromString(static_gw); _sn.fromString(static_sn); wifiManager.setSTAStaticIPConfig(_ip, _gw, _sn); - + //add all your parameters here wifiManager.addParameter(&custom_mqtt_server); wifiManager.addParameter(&custom_mqtt_port); @@ -125,7 +128,7 @@ void setup() { //set minimu quality of signal so it ignores AP's under that quality //defaults to 8% wifiManager.setMinimumSignalQuality(); - + //sets timeout until configuration portal gets turned off //useful to make it all retry or go to sleep //in seconds @@ -154,8 +157,12 @@ void setup() { //save the custom parameters to FS if (shouldSaveConfig) { Serial.println("saving config"); +#ifdef UseJsonV6 + DynamicJsonDocument json(1024); +#else DynamicJsonBuffer jsonBuffer; JsonObject& json = jsonBuffer.createObject(); +#endif json["mqtt_server"] = mqtt_server; json["mqtt_port"] = mqtt_port; json["blynk_token"] = blynk_token; @@ -169,8 +176,13 @@ void setup() { Serial.println("failed to open config file for writing"); } - json.prettyPrintTo(Serial); +#ifdef UseJsonV6 + serializeJson(json, Serial); + serializeJson(json, configFile); +#else + json.printTo(Serial); json.printTo(configFile); +#endif configFile.close(); //end save } @@ -183,6 +195,4 @@ void setup() { void loop() { // put your main code here, to run repeatedly: - - } From a6438edb3ce27e9bfebabba67f897021820c3e2f Mon Sep 17 00:00:00 2001 From: Ruan de Villiers Date: Wed, 15 Jan 2020 07:24:28 +0200 Subject: [PATCH 12/12] Auto check ArduinoJson rather than using a #define --- .../AutoConnectWithFSParameters.ino | 9 +++------ .../AutoConnectWithFSParametersAndCustomIP.ino | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino index f262901..c62ca7b 100644 --- a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino +++ b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino @@ -7,9 +7,6 @@ #include //https://github.com/bblanchon/ArduinoJson -//Comment out this line if you are still using ArduinoJsonV5 -#define UseJsonV6 - //define your default values here, if there are different values in config.json, they are overwritten. char mqtt_server[40]; char mqtt_port[6] = "8080"; @@ -49,7 +46,7 @@ void setup() { configFile.readBytes(buf.get(), size); -#ifdef UseJsonV6 +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 DynamicJsonDocument json(1024); auto deserializeError = deserializeJson(json, buf.get()); serializeJson(json, Serial); @@ -136,7 +133,7 @@ void setup() { //save the custom parameters to FS if (shouldSaveConfig) { Serial.println("saving config"); -#ifdef UseJsonV6 +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 DynamicJsonDocument json(1024); #else DynamicJsonBuffer jsonBuffer; @@ -151,7 +148,7 @@ void setup() { Serial.println("failed to open config file for writing"); } -#ifdef UseJsonV6 +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 serializeJson(json, Serial); serializeJson(json, configFile); #else diff --git a/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino b/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino index b29cfa7..e510a74 100644 --- a/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino +++ b/examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino @@ -9,9 +9,6 @@ #include //https://github.com/bblanchon/ArduinoJson -//Comment out this line if you are still using ArduinoJsonV5 -#define UseJsonV6 - //define your default values here, if there are different values in config.json, they are overwritten. //length should be max size + 1 char mqtt_server[40]; @@ -55,7 +52,7 @@ void setup() { std::unique_ptr buf(new char[size]); configFile.readBytes(buf.get(), size); -#ifdef UseJsonV6 +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 DynamicJsonDocument json(1024); auto deserializeError = deserializeJson(json, buf.get()); serializeJson(json, Serial); @@ -157,7 +154,7 @@ void setup() { //save the custom parameters to FS if (shouldSaveConfig) { Serial.println("saving config"); -#ifdef UseJsonV6 +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 DynamicJsonDocument json(1024); #else DynamicJsonBuffer jsonBuffer; @@ -176,7 +173,7 @@ void setup() { Serial.println("failed to open config file for writing"); } -#ifdef UseJsonV6 +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 serializeJson(json, Serial); serializeJson(json, configFile); #else