old mode 100644

new mode 100755

@@ -1,26 +1,36 @@

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

 #include <ESP8266WiFi.h>

 #include <PubSubClient.h>

-#include <WiFiManager.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 <PietteTech_DHT.h>

 #include <ESP8266HTTPClient.h>

 #include <ESP8266httpUpdate.h>

-// Modifica cu datele tale

-const char* mqttUser = "qbzesh";

-const char* mqttPassword = "8219CHqbzesh";

-const char* mqttSUB = "cmnd/qbzesh-1250/ESP";

-const char* mqttESP = "stat/qbzesh-1250/ESP";

-const char* mqttTEMP = "stat/qbzesh-1250/TEMP";

-const char* mqttLWT = "tele/qbzesh-1250/LWT";

-const char* espName ="qbzesh-1250";

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

-// NU EDITA MAI JOS

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

-const String model = "NodeMCU DHT22";

-const String ver = "v1.0.6";

+// senzor de temperatura DHT

+#define DHTPIN D1 // pinul de date 

+#define DHTTYPE DHT22 // DHT11 (albastru) DHT22 (alb)

+#define DEBUG 0 //0=off 1=on

+

+/********** 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 ";

+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

@@ -33,9 +43,6 @@ String mqttMessage;

 bool bDHTstarted;

 int acquireresult;

-// senzor de temperatura DHT

-#define DHTPIN D4 // pinul de date (la mine am pus senzor pe D4)

-#define DHTTYPE DHT22 // DHT 11

 void dht_wrapper();

 PietteTech_DHT DHT(DHTPIN, DHTTYPE, dht_wrapper);

 void dht_wrapper() 

@@ -46,7 +53,33 @@ void dht_wrapper()

 WiFiClient espClient;

 PubSubClient client(espClient);

+bool readConfigFile();

+

+

+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="";

@@ -68,15 +101,25 @@ String getMacAddress() {

   return cMac;

 }

-void reconnect() 

-{

-  while (!client.connected()) 

-  {

-    //Serial.println("Reconectare la MQTT ...");

-    // Incerc sa ma reconectez cu LWT din 60 in 60 secunde

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

-    {

-      Serial.println("Senzor reconectat la MQTT.");

+void reconectez() {

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

+    #if DEBUG

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

+    #endif

+    delay(99999999);

+  }

+  

+  // ma conectez la mqtt server

+  while (!client.connected()) {

+    client.setServer(mqttServer, mqttPort);

+    #if DEBUG

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

+    #endif

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

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

+      #if DEBUG

+      Serial.println("connected");

+      #endif

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

       // trimit informatii utile cand ma conectez

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

@@ -86,89 +129,85 @@ void reconnect()

         esp_info += "\"}";       

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

         netinfo += String (model);

+        netinfo += "DHT";

+        netinfo += String (DHTTYPE);

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

         netinfo += String (ver);

         netinfo += "\"}";            

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

+        #if DEBUG

         Serial.println(netinfo);

+        #endif

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

+        #if DEBUG

         Serial.println(esp_info);

+        #endif

         client.publish(mqttESP, "15 minute",TRUE); // trimit intervalul default

         client.subscribe(mqttSUB);

-    } 

-    else 

-    {

-        Serial.println("Reconectare MQTT esuata: ");

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

-        Serial.println("fac o alta incercare in 60 de secunde");

-        delay(60000);

+    } else {

+      #if DEBUG

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

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

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

+      #endif

+      // Wait 60 seconds before retrying

+      delay(60000);

     }

   }

 }

- 

+

 void setup()

 {

+  #if DEBUG

   Serial.begin(115200);

+  #endif

+  // Mount the filesystem

+  bool result = SPIFFS.begin();

+  #if DEBUG

+  //Serial.println("SPIFFS opened: " + result);

+  #endif

+  

+  readConfigFile(); //citesc user si devid din memorie

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

+  

   // 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")) {

+     #if DEBUG

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

+     #endif

   }

   delay(200);

- 

-  // ma conectez la mqtt server

-  client.setServer(mqttServer, mqttPort);

-    while (!client.connected()) {

-    Serial.println("Conectare la MQTT ...");

-    // fac connect cu LWT

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

-      Serial.println("Senzor conectat la MQTT.");

-      // 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);   

-        client.subscribe(mqttSUB);

-      } 

-      else {

-        Serial.print("Conectare MQTT esuata: ");

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

-        delay(2000);

-    }

-  }

-  client.setCallback(getMessage);

+

+  reconectez();

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

+

 }

 void getMessage(char* topic, byte* payload, unsigned int length) {

   mqttMessage="";

+  #if DEBUG

   Serial.print("Message arrived in topic: ");

   Serial.println(topic);

   Serial.print("Message:");

+  #endif

   for (int i = 0; i < length; i++) {

     mqttMessage += (char)payload[i];

   }

+  #if DEBUG

   Serial.println(mqttMessage);

- 

+  #endif

+  

   // daca a primit temp va trimite temperatura 

   if (mqttMessage == "temp")

   {

+      #if DEBUG

       Serial.println("Trimit temperatura si umiditatea");

+      #endif

       acquireresult = DHT.acquireAndWait(2000);

       if ( acquireresult == 0 ) 

       {

@@ -181,23 +220,36 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

            json += String (h);

            json += "}";  

            client.publish(mqttTEMP, json.c_str(),TRUE);

+           #if DEBUG

            Serial.println(json);

+           #endif

       } 

       else 

       {

         t = h = 0;

+        #if DEBUG

         Serial.println("Nu am putut citi temperatura si umiditatea");

+        #endif

       }    

   }  

-  // procedura de software update via WEB

+// reset la ESP

+  if (mqttMessage == "reset")

+  {

+      String lastwords="Am fost resetat ...";

+      client.publish(mqttESP, lastwords.c_str(), TRUE);

+      delay (3000);

+      ESP.reset();

+      delay (5000);

+  }

+// procedura de software update via WEB

    if (mqttMessage == "update")

    {

         String msg="Software update: ";

         t_httpUpdate_return ret; 

         //ESPhttpUpdate.rebootOnUpdate(false);

-        ret = ESPhttpUpdate.update("http://update.clickhome.ro/senzor/dht/arduino.bin");  

-        //ret = ESPhttpUpdate.update("update.clickhome.ro", 80, "/senzor/dht/arduino.bin");

+        ret = ESPhttpUpdate.update("http://update.clickhome.ro/senzor/dallas/arduino.bin");  

+        //ret = ESPhttpUpdate.update("update.clickhome.ro", 80, "/senzor/dallas/arduino.bin");

         switch(ret) {

            case HTTP_UPDATE_FAILED:

                msg.concat(" eroare:");

@@ -212,10 +264,13 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

                msg.concat(" success.");

                break;

         }

+        #if DEBUG

         Serial.println(msg);

+        #endif

    }

   // daca a primit valoarea in minute seteaza loopTimer si-l trimite in DB

+  

    if (mqttMessage == "debug")

    {

         loopTimer=30000; // setez sa trimita valori la 30 de secunde ca sa fac debug

@@ -248,18 +303,58 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

    }  

 }

+bool readConfigFile() {

+  // this opens the config file in read-mode

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

+  

+  if (!f) {

+    #if DEBUG

+    Serial.println("Configuration file not found");

+    #endif

+    return false;

+  } else {

+    // we could open the file

+    size_t size = f.size();

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

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

+

+    // Read and store file contents in buf

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

+    // Closing file

+    f.close();

+    // Using dynamic JSON buffer which is not the recommended memory model, but anyway

+    // See https://github.com/bblanchon/ArduinoJson/wiki/Memory%20model

+    DynamicJsonBuffer jsonBuffer;

+    // Parse JSON string

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

+    // Test if parsing succeeds.

+    if (!json.success()) {

+      #if DEBUG

+      Serial.println("JSON parseObject() failed");

+      #endif

+      return false;

+    }

+    #if DEBUG

+    json.printTo(Serial);

+    #endif

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

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

+  }

+  return true;

+}

+

+

 void loop()

 {

   if (!client.connected()) {

-    reconnect();

+    reconectez();

   }

   client.loop();

   long now = millis();

   if (now - lastMsg > loopTimer) {

      lastMsg = now;

      acquireresult = DHT.acquireAndWait(2000);

-     if ( acquireresult == 0 ) 

-      {

+     if ( acquireresult == 0 ) {

            loopTemp = DHT.getCelsius();

            loopHumi = DHT.getHumidity();

            delay(10);

@@ -269,10 +364,9 @@ void loop()

            val += String (loopHumi);

            val += "}";  

            client.publish(mqttESP, val.c_str(),TRUE);

-      } 

-      else 

-      {

+      } else {

         loopTemp = loopHumi = 0;

       }

    }

-}   

+}

+