diff --git a/examples/AutoConnect/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino b/examples/AutoConnect/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino index fea3287..c62ca7b 100644 --- a/examples/AutoConnect/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino +++ b/examples/AutoConnect/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino @@ -1,20 +1,16 @@ -#include // this needs to be first, or it all crashes and burns... -#include // https://github.com/tzapu/WiFiManager -#include // https://github.com/bblanchon/ArduinoJson +#include //this needs to be first, or it all crashes and burns... +#include //https://github.com/esp8266/Arduino +//needed for library +#include +#include +#include //https://github.com/tzapu/WiFiManager -#ifdef ESP32 - #include -#endif +#include //https://github.com/bblanchon/ArduinoJson //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"; -char api_token[32] = "YOUR_API_TOKEN"; - -//default custom static IP -char static_ip[16] = "10.0.1.56"; -char static_gw[16] = "10.0.1.1"; -char static_sn[16] = "255.255.255.0"; +char mqtt_port[6] = "8080"; +char blynk_token[34] = "YOUR_BLYNK_TOKEN"; //flag for saving data bool shouldSaveConfig = false; @@ -25,9 +21,13 @@ void saveConfigCallback () { shouldSaveConfig = true; } -void setupSpiffs(){ +void setup() { + // put your setup code here, to run once: + Serial.begin(115200); + Serial.println(); + //clean FS, for testing - // SPIFFS.format(); + //SPIFFS.format(); //read configuration from FS json Serial.println("mounting FS..."); @@ -45,131 +45,125 @@ void setupSpiffs(){ std::unique_ptr buf(new char[size]); configFile.readBytes(buf.get(), size); + +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 + 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(api_token, json["api_token"]); - - // if(json["ip"]) { - // Serial.println("setting custom ip from config"); - // strcpy(static_ip, json["ip"]); - // strcpy(static_gw, json["gateway"]); - // strcpy(static_sn, json["subnet"]); - // Serial.println(static_ip); - // } else { - // Serial.println("no custom ip in config"); - // } - + strcpy(blynk_token, json["blynk_token"]); } else { Serial.println("failed to load json config"); } + configFile.close(); } } } else { Serial.println("failed to mount FS"); } //end read -} -void setup() { - // put your setup code here, to run once: - Serial.begin(115200); - Serial.println(); - - setupSpiffs(); - - // WiFiManager, Local intialization. Once its business is done, there is no need to keep it around - WiFiManager wm; - - //set config save notify callback - wm.setSaveConfigCallback(saveConfigCallback); - - // setup custom parameters - // // 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 WiFiManagerParameter custom_mqtt_server("server", "mqtt server", mqtt_server, 40); WiFiManagerParameter custom_mqtt_port("port", "mqtt port", mqtt_port, 6); - WiFiManagerParameter custom_api_token("api", "api token", "", 32); + WiFiManagerParameter custom_blynk_token("blynk", "blynk token", blynk_token, 32); + + //WiFiManager + //Local intialization. Once its business is done, there is no need to keep it around + WiFiManager wifiManager; + + //set config save notify callback + wifiManager.setSaveConfigCallback(saveConfigCallback); + + //set static ip + wifiManager.setSTAStaticIPConfig(IPAddress(10, 0, 1, 99), IPAddress(10, 0, 1, 1), IPAddress(255, 255, 255, 0)); //add all your parameters here - wm.addParameter(&custom_mqtt_server); - wm.addParameter(&custom_mqtt_port); - wm.addParameter(&custom_api_token); + wifiManager.addParameter(&custom_mqtt_server); + wifiManager.addParameter(&custom_mqtt_port); + wifiManager.addParameter(&custom_blynk_token); - // set static ip - // IPAddress _ip,_gw,_sn; - // _ip.fromString(static_ip); - // _gw.fromString(static_gw); - // _sn.fromString(static_sn); - // wm.setSTAStaticIPConfig(_ip, _gw, _sn); + //reset settings - for testing + //wifiManager.resetSettings(); - //reset settings - wipe credentials for testing - //wm.resetSettings(); + //set minimu quality of signal so it ignores AP's under that quality + //defaults to 8% + //wifiManager.setMinimumSignalQuality(); - //automatically connect using saved credentials if they exist - //If connection fails it starts an access point with the specified name - //here "AutoConnectAP" if empty will auto generate basedcon chipid, if password is blank it will be anonymous + //sets timeout until configuration portal gets turned off + //useful to make it all retry or go to sleep + //in seconds + //wifiManager.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 (!wm.autoConnect("AutoConnectAP", "password")) { + if (!wifiManager.autoConnect("AutoConnectAP", "password")) { Serial.println("failed to connect and hit timeout"); delay(3000); - // if we still have not connected restart and try all over again - ESP.restart(); + //reset and try again, or maybe put it to deep sleep + ESP.reset(); delay(5000); } - // always start configportal for a little while - // wm.setConfigPortalTimeout(60); - // wm.startConfigPortal("AutoConnectAP","password"); - //if you get here you have connected to the WiFi Serial.println("connected...yeey :)"); //read updated parameters strcpy(mqtt_server, custom_mqtt_server.getValue()); strcpy(mqtt_port, custom_mqtt_port.getValue()); - strcpy(api_token, custom_api_token.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 ARDUINOJSON_VERSION_MAJOR >= 6 + DynamicJsonDocument json(1024); +#else DynamicJsonBuffer jsonBuffer; JsonObject& json = jsonBuffer.createObject(); +#endif json["mqtt_server"] = mqtt_server; - json["mqtt_port"] = mqtt_port; - json["api_token"] = api_token; - - // json["ip"] = WiFi.localIP().toString(); - // json["gateway"] = WiFi.gatewayIP().toString(); - // json["subnet"] = WiFi.subnetMask().toString(); + json["mqtt_port"] = mqtt_port; + json["blynk_token"] = blynk_token; File configFile = SPIFFS.open("/config.json", "w"); if (!configFile) { Serial.println("failed to open config file for writing"); } - json.prettyPrintTo(Serial); +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 + serializeJson(json, Serial); + serializeJson(json, configFile); +#else + json.printTo(Serial); json.printTo(configFile); +#endif configFile.close(); //end save - shouldSaveConfig = false; } Serial.println("local ip"); Serial.println(WiFi.localIP()); - Serial.println(WiFi.gatewayIP()); - Serial.println(WiFi.subnetMask()); } void loop() { // put your main code here, to run repeatedly: - } diff --git a/examples/AutoConnect/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino b/examples/AutoConnect/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino index 6b1a7af..e510a74 100644 --- a/examples/AutoConnect/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino +++ b/examples/AutoConnect/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino @@ -1,16 +1,19 @@ -#include // this needs to be first, or it all crashes and burns... -#include // https://github.com/tzapu/WiFiManager -#include // https://github.com/bblanchon/ArduinoJson +#include //this needs to be first, or it all crashes and burns... -#ifdef ESP32 - #include -#endif +#include //https://github.com/esp8266/Arduino + +//needed for library +#include +#include +#include //https://github.com/tzapu/WiFiManager + +#include //https://github.com/bblanchon/ArduinoJson //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]; -char mqtt_port[6] = "8080"; -char api_token[32] = "YOUR_API_TOKEN"; - +char mqtt_port[6] = "8080"; +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"; @@ -25,9 +28,13 @@ void saveConfigCallback () { shouldSaveConfig = true; } -void setupSpiffs(){ +void setup() { + // put your setup code here, to run once: + Serial.begin(115200); + Serial.println(); + //clean FS, for testing - // SPIFFS.format(); + //SPIFFS.format(); //read configuration from FS json Serial.println("mounting FS..."); @@ -45,17 +52,24 @@ void setupSpiffs(){ std::unique_ptr buf(new char[size]); configFile.readBytes(buf.get(), size); +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 + 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(api_token, json["api_token"]); + strcpy(blynk_token, json["blynk_token"]); - if(json["ip"]) { + if (json["ip"]) { Serial.println("setting custom ip from config"); strcpy(static_ip, json["ip"]); strcpy(static_gw, json["gateway"]); @@ -64,7 +78,6 @@ void setupSpiffs(){ } else { Serial.println("no custom ip in config"); } - } else { Serial.println("failed to load json config"); } @@ -74,55 +87,59 @@ void setupSpiffs(){ Serial.println("failed to mount FS"); } //end read -} + Serial.println(static_ip); + Serial.println(blynk_token); + Serial.println(mqtt_server); -void setup() { - WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP - // put your setup code here, to run once: - Serial.begin(115200); - Serial.println(); - setupSpiffs(); - - // WiFiManager, Local intialization. Once its business is done, there is no need to keep it around - WiFiManager wm; - - //set config save notify callback - wm.setSaveConfigCallback(saveConfigCallback); - - // setup custom parameters - // // 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 WiFiManagerParameter custom_mqtt_server("server", "mqtt server", mqtt_server, 40); - WiFiManagerParameter custom_mqtt_port("port", "mqtt port", mqtt_port, 6); - WiFiManagerParameter custom_api_token("api", "api token", "", 32); + WiFiManagerParameter custom_mqtt_port("port", "mqtt port", mqtt_port, 5); + WiFiManagerParameter custom_blynk_token("blynk", "blynk token", blynk_token, 34); - //add all your parameters here - wm.addParameter(&custom_mqtt_server); - wm.addParameter(&custom_mqtt_port); - wm.addParameter(&custom_api_token); + //WiFiManager + //Local intialization. Once its business is done, there is no need to keep it around + WiFiManager wifiManager; - // set static ip - IPAddress _ip,_gw,_sn; + //set config save notify callback + wifiManager.setSaveConfigCallback(saveConfigCallback); + + //set static ip + IPAddress _ip, _gw, _sn; _ip.fromString(static_ip); _gw.fromString(static_gw); _sn.fromString(static_sn); - wm.setSTAStaticIPConfig(_ip, _gw, _sn); - //reset settings - wipe credentials for testing - //wm.resetSettings(); + wifiManager.setSTAStaticIPConfig(_ip, _gw, _sn); - //automatically connect using saved credentials if they exist - //If connection fails it starts an access point with the specified name - //here "AutoConnectAP" if empty will auto generate basedcon chipid, if password is blank it will be anonymous + //add all your parameters here + wifiManager.addParameter(&custom_mqtt_server); + wifiManager.addParameter(&custom_mqtt_port); + wifiManager.addParameter(&custom_blynk_token); + + //reset settings - for testing + //wifiManager.resetSettings(); + + //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 + //wifiManager.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 (!wm.autoConnect("AutoConnectAP", "password")) { + if (!wifiManager.autoConnect("AutoConnectAP", "password")) { Serial.println("failed to connect and hit timeout"); delay(3000); - // if we still have not connected restart and try all over again - ESP.restart(); + //reset and try again, or maybe put it to deep sleep + ESP.reset(); delay(5000); } @@ -132,31 +149,39 @@ void setup() { //read updated parameters strcpy(mqtt_server, custom_mqtt_server.getValue()); strcpy(mqtt_port, custom_mqtt_port.getValue()); - strcpy(api_token, custom_api_token.getValue()); + strcpy(blynk_token, custom_blynk_token.getValue()); //save the custom parameters to FS if (shouldSaveConfig) { Serial.println("saving config"); +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 + DynamicJsonDocument json(1024); +#else DynamicJsonBuffer jsonBuffer; JsonObject& json = jsonBuffer.createObject(); +#endif json["mqtt_server"] = mqtt_server; - json["mqtt_port"] = mqtt_port; - json["api_token"] = api_token; + json["mqtt_port"] = mqtt_port; + json["blynk_token"] = blynk_token; - json["ip"] = WiFi.localIP().toString(); - json["gateway"] = WiFi.gatewayIP().toString(); - json["subnet"] = WiFi.subnetMask().toString(); + json["ip"] = WiFi.localIP().toString(); + json["gateway"] = WiFi.gatewayIP().toString(); + json["subnet"] = WiFi.subnetMask().toString(); File configFile = SPIFFS.open("/config.json", "w"); if (!configFile) { Serial.println("failed to open config file for writing"); } - json.prettyPrintTo(Serial); +#ifdef ARDUINOJSON_VERSION_MAJOR >= 6 + serializeJson(json, Serial); + serializeJson(json, configFile); +#else + json.printTo(Serial); json.printTo(configFile); +#endif configFile.close(); //end save - shouldSaveConfig = false; } Serial.println("local ip"); @@ -167,6 +192,4 @@ void setup() { void loop() { // put your main code here, to run repeatedly: - - }