@@ -1,24 +1,23 @@

+#include <FS.h>                   //this needs to be first, e folosit de salvarea credentialelor pe FS

 #include <ESP8266WiFi.h>

 #include <PubSubClient.h>

 #include <WiFiManager.h>        //https://github.com/tzapu/WiFiManager

+#include <ArduinoJson.h>          //https://github.com/bblanchon/ArduinoJson pentru salvarea credentialelor in eprom

 #include <WiFiClient.h> 

 #include <OneWire.h>

 #include <DallasTemperature.h>

-// Modifica cu datele tale

-const char* mqttUser = "rqx958t";

-const char* mqttPassword = "8219CHrqx958t";

-const char* mqttSUB = "cmnd/rqx958t-1460/ESP";

-const char* mqttESP = "stat/rqx958t-1460/ESP";

-const char* mqttTEMP = "stat/rqx958t-1460/TEMP";

-const char* mqttLWT = "tele/rqx958t-1460/LWT";

-const char* espName ="rqx958t-1460";

-

-//#######################################################################

-// NU EDITA MAI JOS

-//#######################################################################

+char mqtt_user[9]; //le va lua din FS

+char mqtt_devid[5]; //le va lua din FS

+char mqttPassword[15]; //urmatoarele le va genera cu functia gen

+char mqttSUB[22];

+char espName[13];

+char mqttESP[22];

+char mqttTEMP[23];

+char mqttLWT[22];

+

 const String model = "NodeMCU Dallas";

-const String ver = "v1.0.5";

+const String ver = "v2.0.0";

 const char* mqttServer = "mqtt.clickhome.ro";

 const int mqttPort = 1883;

 long loopTimer = 900000; // miliseconds - by default trimite la 15 minute

@@ -37,6 +36,30 @@ DallasTemperature sensors(&oneWire);

 WiFiClient espClient;

 PubSubClient client(espClient);

+void generate_vars(){

+  strcpy (mqttPassword, "8219CH");

+  strcat (mqttPassword, mqtt_user);

+

+  strcpy (espName, mqtt_user);

+  strcat (espName, "-");

+  strcat (espName, mqtt_devid);

+

+  strcpy (mqttSUB, "cmnd/");

+  strcat (mqttSUB, espName);

+  strcat (mqttSUB, "/ESP");

+

+  strcpy (mqttESP, "stat/");

+  strcat (mqttESP, espName);

+  strcat (mqttESP, "/ESP");

+

+  strcpy (mqttTEMP, "stat/");

+  strcat (mqttTEMP, espName);

+  strcat (mqttTEMP, "/TEMP");

+

+  strcpy (mqttLWT, "tele/");

+  strcat (mqttLWT, espName);

+  strcat (mqttLWT, "/LWT");

+}

 String ipToString(IPAddress ip){

   String s="";

@@ -58,12 +81,18 @@ String getMacAddress() {

   return cMac;

 }

-void reconnect() {

-  // Loop until we're reconnected

+void reconectez() {

+  while (String(mqtt_user)==""){

+    Serial.println("Invalid user!");

+    delay(99999999);

+  }

+  

+  // ma conectez la mqtt server

   while (!client.connected()) {

+    client.setServer(mqttServer, mqttPort);

     Serial.print("AtloopTempting MQTT connection...");

     // Incerc sa ma reconectez cu LWT din 5 in 5 secunde

-    if (client.connect(espName, mqttUser, mqttPassword, mqttLWT, 1, 1, "Offline")) {

+    if (client.connect(espName, mqtt_user, mqttPassword, mqttLWT, 1, 1, "Offline")) {

       Serial.println("connected");

       client.publish(mqttLWT,"Online",TRUE);

       // trimit informatii utile cand ma conectez

@@ -88,7 +117,7 @@ void reconnect() {

       Serial.print("failed, rc=");

       Serial.print(client.state());

       Serial.println(" try again in 60 seconds");

-      // Wait 5 seconds before retrying

+      // Wait 60 seconds before retrying

       delay(60000);

     }

   }

@@ -97,50 +126,30 @@ void reconnect() {

 void setup()

 {

   Serial.begin(115200);

+  //generez variabilele

+  readFS();

+  // 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_user("user", "mqtt user", mqtt_user, 9);

+  WiFiManagerParameter custom_mqtt_devid("devid", "mqtt devid", mqtt_devid, 5);

   // ma conectez la AP via wifi

    WiFiManager wifi;

+   wifi.setConfigPortalTimeout(120); // a timeout so the ESP doesn't hang waiting to be configured, for instance after a power failure

    wifi.setTimeout(180); // sta AP 3 minute apoi se reseteaza din nou

    if (!wifi.autoConnect("ClickHome")) {

      Serial.println("timeout - going to sleep");

   }

   delay(200);

- 

-  // ma conectez la mqtt server

-  client.setServer(mqttServer, mqttPort);

-    while (!client.connected()) {

-    Serial.println("Connecting to MQTT...");

-    // fac connect cu LWT

-    if (client.connect(espName, mqttUser, mqttPassword, mqttLWT, 1, 1, "Offline")) {

-      // trimit starea Online pe topic LWT cand ma conectez

-      client.publish(mqttLWT,"Online",TRUE);

-      // trimit informatii utile cand ma conectez

-        String esp_info = "{\"ESPMac\":\"";

-        esp_info += getMacAddress();

-        esp_info += "\", \"IPAddress\":\"";

-        esp_info += ipToString(WiFi.localIP());    

-        esp_info += "\"}";       

-        String netinfo = "{\"Module\":\"";

-        netinfo += String (model);

-        netinfo += "\", \"Version\":\"";

-        netinfo += String (ver);

-        netinfo += "\"}";        

-        client.publish(mqttESP, netinfo.c_str(),TRUE);

-        Serial.println(netinfo);

-        client.publish(mqttESP, esp_info.c_str(),TRUE);

-        Serial.println(esp_info);

-        client.publish(mqttESP, "{\"LoopInterval\":\"15 minute\"}",TRUE);   

-        Serial.println("connected");

-        client.subscribe(mqttSUB);

-      } 

-      else {

-        Serial.print("failed with state ");

-        Serial.print(client.state());

-        delay(2000);

-    }

-  }

-  // astept mesajul de la serverul MQTT

-  client.setCallback(getMessage);

+

+  strcpy(mqtt_user, custom_mqtt_user.getValue()); //citesc datele salvate anterior pe FS

+  strcpy(mqtt_devid, custom_mqtt_devid.getValue());

+  generate_vars(); //genereaza topicurile de mqtt in baza mqtt_user si mqtt_devid

+  reconectez();

+  client.setCallback(getMessage); //setez functia care parseaza mesajele venite prin mqtt

+

   pinMode(inPin, INPUT);

   sensors.begin();

 }

@@ -204,10 +213,46 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

    }  

 }

+void readFS(){

+  //read configuration from FS json

+  //Serial.println("mounting FS...");

+

+  if (SPIFFS.begin()) {

+    //Serial.println("mounted file system");

+    if (SPIFFS.exists("/config.json")) {

+      //file exists, reading and loading

+      //Serial.println("reading config file");

+      File configFile = SPIFFS.open("/config.json", "r");

+      if (configFile) {

+        //Serial.println("opened config file");

+        

+        size_t size = configFile.size();

+        // Allocate a buffer to store contents of the file.

+        std::unique_ptr<char[]> buf(new char[size]);

+

+        configFile.readBytes(buf.get(), size);

+        DynamicJsonBuffer jsonBuffer;

+        JsonObject& json = jsonBuffer.parseObject(buf.get());

+        //json.printTo(Serial);

+        if (json.success()) {

+          //Serial.println("\nparsed json");

+          strcpy(mqtt_user, json["mqtt_user"]);

+          strcpy(mqtt_devid, json["mqtt_devid"]);

+        } else {

+          //Serial.println("failed to load json config");

+        }

+      }

+    }

+  } else {

+    //Serial.println("failed to mount FS");

+  }

+  //end read

+}

+

 void loop()

 {

   if (!client.connected()) {

-    reconnect();

+    reconectez();

   }

   client.loop();

   long now = millis();