@@ -8,11 +8,12 @@

 #include <ESP8266HTTPClient.h>

 #include <ESP8266httpUpdate.h>

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

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

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

-bool pir1,lastVAL;

-float t_pir1;

+bool ARM,lastPIR;

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

+float t_alarma=0;

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

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

@@ -20,15 +21,14 @@ char mqttPassword[15]; //urmatoarele le va genera cu functia gen

 char mqttSUB[22];

 char espName[13];

 char mqttESP[22];

+char mqttALM[24];

+char mqttPIR[22];

 char mqttLWT[22];

 const String model = "NodeMCU PIR";

 const String ver = "v2.0.0";

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

 const int mqttPort = 1883;

-long loopTimer = 1000; // miliseconds - debug

-long lastMsg = 0;

-float loopTemp = 0;

 String mqttMessage;

 WiFiClient espClient;

@@ -51,6 +51,14 @@ void generate_vars(){

   strcat (mqttESP, espName);

   strcat (mqttESP, "/ESP");

+  strcpy (mqttPIR, "stat/");

+  strcat (mqttPIR, espName);

+  strcat (mqttPIR, "/PIR");

+

+  strcpy (mqttALM, "stat/");

+  strcat (mqttALM, espName);

+  strcat (mqttALM, "/ALARM");

+

   strcpy (mqttLWT, "tele/");

   strcat (mqttLWT, espName);

   strcat (mqttLWT, "/LWT");

@@ -203,16 +211,35 @@ void getMessage(char* topic, byte* payload, unsigned int length) {

         Serial.println(msg);

         #endif

    }

-

-  // reset la ESP

-  if (mqttMessage == "reset")

-  {

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

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

-      delay (3000);

-      ESP.reset();

-      delay (5000);

-  }

+  

+    if (mqttMessage == "stare")

+    {

+      // citesc starea si o trimit

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

+      json += String (ARM);

+      json += "\"}";

+      Serial.println(json);

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

+    }

+  

+    if (mqttMessage == "ARM" || mqttMessage == "DISARM")

+    {

+      ARM = (mqttMessage=="ARM") ? true : false;

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

+      json += String (ARM);

+      json += "\"}";

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

+    }

+  

+    // reset la ESP

+    if (mqttMessage == "reset")

+    {

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

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

+        delay (3000);

+        ESP.reset();

+        delay (5000);

+    }

 }

@@ -264,21 +291,24 @@ void loop()

   }

   client.loop();

-  if (digitalRead(PIR)==1){ //verific daca nu e falsa alarma

-      if (t_pir1==0)

-        t_pir1=millis();

-      if (millis() - t_pir1 > 1500)

-        pir1=1; //este intradevar miscare

-  }else{

-      if (t_pir1>0)  t_pir1=0;

-      pir1=0;

-  }

-

-  if (pir1!=lastVAL){

-    lastVAL=pir1;

-    #if DEBUG

-    Serial.println(pir1);

-    #endif

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

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

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

+        if (millis() - t_alarma > interval_alarma){ //daca a trecut timpul de la alarma anterioara

+          String json = "{\"PIR\":1}";

+          client.publish(mqttALM, json.c_str(),TRUE);

+          t_alarma=millis();

+          #if DEBUG

+          Serial.print("Trimis mqtt alarm:");

+          #endif

+        }

+      }

+      #if DEBUG

+      Serial.print("Direct PIN:");

+      Serial.println (digitalRead(PIR));

+      #endif

+      lastPIR=digitalRead(PIR);

+    }

   }

 }