@@ -9,6 +9,8 @@

 #include <ESP8266HTTPClient.h>

 #include <ESP8266httpUpdate.h>

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

+

 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

@@ -87,17 +89,23 @@ String getMacAddress() {

 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\":\"";

@@ -112,15 +120,21 @@ void reconectez() {

         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 {

+      #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);

     }

@@ -129,11 +143,15 @@ void reconectez() {

 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

@@ -143,7 +161,9 @@ void setup()

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

@@ -157,18 +177,24 @@ void setup()

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

   float t = 0;

   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 sendTemp trimite temperatura 

   if (mqttMessage == "temp")

   {

+    #if DEBUG

     Serial.println("Trimit temperatura");

+    #endif

     sensors.setResolution(12);

     sensors.requestTemperatures(); // Send the command to get Temperatures

     t = sensors.getTempCByIndex(0);

@@ -176,7 +202,9 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

       json += String (t);

       json += "}";

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

+      #if DEBUG

       Serial.println(json);

+      #endif

   }  

 // reset la ESP

   if (mqttMessage == "reset")

@@ -209,7 +237,9 @@ 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

@@ -251,7 +281,9 @@ bool readConfigFile() {

   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

@@ -270,10 +302,14 @@ bool readConfigFile() {

     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"]);

   }

@@ -293,7 +329,9 @@ void loop()

     sensors.setResolution(12);

     sensors.requestTemperatures(); // Send the command to get loopTemperatures

     loopTemp = sensors.getTempCByIndex(0);

+    #if DEBUG

     Serial.println(loopTemp);

+    #endif

     if((loopTemp > -20) && (loopTemp <60))

       {

      String val = "{\"Temp\":";