@@ -8,7 +8,7 @@

 //ESP8266-01 nu are suficienta memorie pt update http

 const char* mqtt_user="64x35up";

 const char* mqtt_devid="5566";

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

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

 #define RELAY 0 //  pinul de date 

 /********** NU edita mai jos ******************/

@@ -18,15 +18,15 @@ char espName[13];

 char mqttESP[22];

 char mqttRELAY[23];

 char mqttLWT[22];

+char mqttSTA[24];

 const String model = "ESP8266 Releu";

-const String ver = "v1.0.1";

+const String ver = "v1.1.0";

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

 const int mqttPort = 1883;

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

-long lastMsg = 0;

-float loopTemp = 0;

 String mqttMessage;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

 WiFiClient espClient;

 PubSubClient client(espClient);

@@ -54,6 +54,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -153,7 +157,14 @@ void setup()

   reconectez();

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

+  update_state(); //facem update la mqtt cu Uptime

+}

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

 }

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

@@ -210,13 +221,12 @@ void loop()

     reconectez();

   }

   client.loop();

-  long now = millis(); 

-  if (now - lastMsg > loopTimer) 

-  {

-    lastMsg = now;

-    #if DEBUG

-    Serial.println("Nu fac nimic in bucla");

-    #endif

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

   }

+  //end update

+

 }

@@ -10,7 +10,7 @@

 const char* mqtt_user="64x35up";

 const char* mqtt_devid="1791";

 #define ONE_WIRE_BUS 2 // pinul de date

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

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

 /********** NU edita mai jos ******************/

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

@@ -19,15 +19,18 @@ char espName[13];

 char mqttESP[22];

 char mqttTEMP[23];

 char mqttLWT[22];

+char mqttSTA[24];

 const String model = "ESP8266 Dallas";

-const String ver = "v1.0.1";

+const String ver = "v1.1.0";

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

 const int mqttPort = 1883;

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

 long lastMsg = 0;

 float loopTemp = 0;

 String mqttMessage;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

 // senzor de temperatura DALLAS

 OneWire oneWire(ONE_WIRE_BUS);

@@ -61,6 +64,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -152,8 +159,15 @@ void setup()

   reconectez();

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

-

   sensors.begin();

+  update_state(); //facem update la mqtt cu Uptime

+}

+

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

 }

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

@@ -237,9 +251,16 @@ void loop()

     reconectez();

   }

   client.loop();

-  long now = millis();

-  if (now - lastMsg > loopTimer) {

-    lastMsg = now;

+

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

+  }

+  //end update

+

+  if (millis() - lastMsg > loopTimer) {

+    lastMsg = millis();

     sensors.setResolution(12);

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

     loopTemp = sensors.getTempCByIndex(0);

@@ -23,9 +23,10 @@ char espName[13];

 char mqttESP[22];

 char mqttTEMP[23];

 char mqttLWT[22];

+char mqttSTA[24];

 const String model = "ESP8266 ";

-const String ver = "v1.0.1";

+const String ver = "v1.1.0";

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

 const int mqttPort = 1883;

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

@@ -37,6 +38,9 @@ float h = 0;

 String mqttMessage;

 bool bDHTstarted;

 int acquireresult;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

+

 void dht_wrapper();

 PietteTech_DHT DHT(DHTPIN, DHTTYPE, dht_wrapper);

@@ -72,6 +76,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -165,7 +173,14 @@ void setup()

   reconectez();

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

+  update_state(); //facem update la mqtt cu Uptime

+}

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

 }

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

@@ -263,9 +278,15 @@ void loop()

     reconectez();

   }

   client.loop();

-  long now = millis();

-  if (now - lastMsg > loopTimer) {

-     lastMsg = now;

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

+  }

+  //end update

+

+  if (millis() - lastMsg > loopTimer) {

+     lastMsg = millis();

      acquireresult = DHT.acquireAndWait(2000);

      if ( acquireresult == 0 ) {

            loopTemp = DHT.getCelsius();

@@ -12,8 +12,10 @@

 #define PIR D1 //  pinul de date D1 la care se conecteaza PIRul

 bool ARM,lastPIR;

-float interval_alarma = 60000; // la ce interval sa trimita notificarile 20 sec = 20000

-float t_alarma=0;

+unsigned int interval_alarma = 60000; // la ce interval sa trimita notificarile 60 sec = 60000 in cazul in care a re doua alarme consecutive

+unsigned long t_alarma=0;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

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

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

@@ -24,9 +26,10 @@ char mqttESP[22];

 char mqttALM[24];

 char mqttPIR[22];

 char mqttLWT[22];

+char mqttSTA[24];

 const String model = "NodeMCU PIR";

-const String ver = "v2.0.0";

+const String ver = "v2.1.0";

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

 const int mqttPort = 1883;

 String mqttMessage;

@@ -62,6 +65,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -174,6 +181,8 @@ void setup()

   json += "\"}";

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

+  update_state(); //facem update la mqtt cu Uptime

+

 }

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

@@ -290,6 +299,13 @@ bool readConfigFile() {

   return true;

 }

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

+}

+

 void loop()

 {

   if (!client.connected()) 

@@ -298,6 +314,13 @@ void loop()

   }

   client.loop();

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

+  }

+  //end update

+  

   if (ARM==1){ //daca e armat

     if (digitalRead(PIR)!=lastPIR){ //daca s-a schimbat valoarea 

       if (digitalRead(PIR)==1){ //daca am alarma

@@ -19,16 +19,17 @@ char espName[13];

 char mqttESP[22];

 char mqttRELAY[23];

 char mqttLWT[22];

+char mqttSTA[24];

 const String model = "NodeMCU Releu";

-const String ver = "v2.0.2";

+const String ver = "v2.1.0";

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

 const int mqttPort = 1883;

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

-long lastMsg = 0;

-float loopTemp = 0;

 String mqttMessage;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

+

 WiFiClient espClient;

 PubSubClient client(espClient);

 bool readConfigFile();

@@ -56,6 +57,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -137,6 +142,12 @@ void reconectez() {

   }

 }

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

+}

 void setup()

 {

@@ -168,7 +179,7 @@ void setup()

   reconectez();

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

-

+  update_state(); //facem update la mqtt cu Uptime

 }

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

@@ -300,12 +311,11 @@ void loop()

     reconectez();

   }

   client.loop();

-  long now = millis(); 

-  if (now - lastMsg > loopTimer) 

-  {

-    lastMsg = now;

-    #if DEBUG

-    Serial.println("Nu fac nimic in bucla");

-    #endif

+

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

   }

+  //end update

 }

old mode 100644

new mode 100755

@@ -11,6 +11,17 @@

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

+const String model = "NodeMCU Dallas";

+const String ver = "v2.2.0";

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

+const int mqttPort = 1883;

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

+long lastMsg = 0;

+float loopTemp = 0;

+String mqttMessage;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

+

 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

@@ -19,15 +30,7 @@ char espName[13];

 char mqttESP[22];

 char mqttTEMP[23];

 char mqttLWT[22];

-

-const String model = "NodeMCU Dallas";

-const String ver = "v2.1.2";

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

-const int mqttPort = 1883;

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

-long lastMsg = 0;

-float loopTemp = 0;

-String mqttMessage;

+char mqttSTA[24];

 // senzor de temperatura DALLAS

 #define ONE_WIRE_BUS D4  // pinul de date care se conecteaza la dallas

@@ -64,6 +67,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -170,6 +177,14 @@ void setup()

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

   sensors.begin();

+  update_state(); //facem update la mqtt cu Uptime

+}

+

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

 }

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

@@ -321,22 +336,27 @@ void loop()

     reconectez();

   }

   client.loop();

-  long now = millis();

-  if (now - lastMsg > loopTimer) {

-    lastMsg = now;

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

+  }

+  //end update

+

+  if (millis() - lastMsg > loopTimer) {

+    lastMsg = millis();

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

-      {

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

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

       val += String (loopTemp);

       val += "}";

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

-      }

+    }

   }

 }

-

+

@@ -18,8 +18,6 @@

 /********** 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

@@ -28,9 +26,10 @@ char espName[13];

 char mqttESP[22];

 char mqttTEMP[23];

 char mqttLWT[22];

+char mqttSTA[24];

 const String model = "NodeMCU ";

-const String ver = "v2.0.1";

+const String ver = "v2.1.0";

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

 const int mqttPort = 1883;

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

@@ -42,6 +41,8 @@ float h = 0;

 String mqttMessage;

 bool bDHTstarted;

 int acquireresult;

+const unsigned long interval_update=1000*60*60; // face update la 60 min 

+unsigned long t_update=0;

 void dht_wrapper();

 PietteTech_DHT DHT(DHTPIN, DHTTYPE, dht_wrapper);

@@ -79,6 +80,10 @@ void generate_vars(){

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

+

+  strcpy (mqttSTA, "tele/");

+  strcat (mqttSTA, espName);

+  strcat (mqttSTA, "/STATE");

 }

 String ipToString(IPAddress ip){

@@ -185,6 +190,14 @@ void setup()

   reconectez();

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

+  update_state(); //facem update la mqtt cu Uptime

+}

+

+void update_state(){ //facem update la mqtt cu Uptime

+    String json = "{\"Uptime\":";

+    json += (int)millis()/3600000; //exprimat in ore

+    json += "}";

+    client.publish(mqttSTA, json.c_str(),FALSE);

 }

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

@@ -349,9 +362,16 @@ void loop()

     reconectez();

   }

   client.loop();

-  long now = millis();

-  if (now - lastMsg > loopTimer) {

-     lastMsg = now;

+

+  //facem update la $interval_update cu uptime

+  if (millis() - t_update > interval_update){

+    update_state();

+    t_update=millis();

+  }

+  //end update

+

+  if (millis() - lastMsg > loopTimer) {

+     lastMsg = millis();

      acquireresult = DHT.acquireAndWait(2000);

      if ( acquireresult == 0 ) {

            loopTemp = DHT.getCelsius();