alarm conditions set up - waiting for tests

src/main.cpp

@@ -20,17 +20,6 @@ int lcdRows = 2;
 
 LiquidCrystal_I2C lcd(0x3f, lcdColumns, lcdRows);
 
-float readADC_Avg(int pin)
-{
-  float avg = analogRead(pin);
-  for (int i = 0; i < 10; i++)
-  {
-    avg = (avg + analogRead(pin)) / 2;
-    delay(20);
-  }
-  return avg;
-}
-
 void setup_wifi()
 {
     delay(10);
@@ -60,9 +49,11 @@ void reconnect()
     {
         Serial.print("Attempting MQTT connection...");
         // Attempt to connect
-    if (client.connect("ESP8266Client"))
+        if (client.connect("ESP8266Client5"))
         {
             Serial.println("connected");
+
+            client.subscribe("alarm/state");
         }
         else
         {
@@ -75,13 +66,43 @@ void reconnect()
     }
 }
 
-#define RELAY_ACTIVATION_PIN D6
-#define REED_ACTIVATION_PIN D5
+void isArming()
+{
+    lcd.clear();
+    lcd.setCursor(0, 0);
+    lcd.print("Arming");
+}
+
+void isArmed()
+{
+    lcd.clear();
+    lcd.setCursor(0, 0);
+    lcd.print("Armed");
+}
+
+void isDisarmed()
+{
+    lcd.clear();
+    lcd.setCursor(0, 0);
+    lcd.print("Disarmed");
+}
+
+void isTriggered()
+{
+    lcd.clear();
+    lcd.setCursor(0, 0);
+    lcd.print("Triggered");
+}
+
+void isDisarming()
+{
+    lcd.clear();
+    lcd.setCursor(0, 0);
+    lcd.print("Disarmed");
+}
 
 void callback(char *topic, byte *payload, unsigned int length)
 {
-  StaticJsonDocument<256> doc;
-  deserializeJson(doc, payload, length);
 
     Serial.print("Message arrived [");
     Serial.print(topic);
@@ -91,14 +112,30 @@ void callback(char *topic, byte *payload, unsigned int length)
         Serial.print((char)payload[i]);
     }
     Serial.println();
+    StaticJsonDocument<512> doc;
+    deserializeJson(doc, payload, length);
 
-  if (doc["deviceId"] == deviceId && doc["lock"] == true)
+    if (strcmp(doc["status"], "Arming") == 0)
     {
-    digitalWrite(RELAY_ACTIVATION_PIN, HIGH); // Turn the relay on
+        isArming();
     }
-  else
+    else if (strcmp(doc["status"], "Armed") == 0)
+    {
+        isArmed();
+    }
+    else if (strcmp(doc["status"], "Disarmed") == 0)
     {
-    digitalWrite(RELAY_ACTIVATION_PIN, LOW); // Turn the relay off
+        isDisarmed();
+    }
+    else if (strcmp(doc["status"], "Disarming") == 0){
+        isDisarming();
+    }
+    else if (strcmp(doc["status"], "Triggered") == 0)
+    {
+        isTriggered();
+        tone(buzzerPin, 1000);
+        delay(1000);
+        noTone(buzzerPin);
     }
 }
 
@@ -106,34 +143,16 @@ void setup()
 {
     Serial.begin(115200);
 
-  pinMode(RELAY_ACTIVATION_PIN, OUTPUT);
-  pinMode(REED_ACTIVATION_PIN, INPUT);
-
     lcd.init();
     lcd.backlight();
     pinMode(buzzerPin, OUTPUT);
 
     setup_wifi();
-  reconnect();
+    client.setCallback(callback);
     client.setServer(mqtt_server, 1883);
+    reconnect();
 }
 
-void isArmed()
-{
-  DynamicJsonDocument doc(1024);
-
-  doc["deviceId"] = deviceId;
-
-  char buffer[1024];
-  size_t n = serializeJson(doc, buffer);
-  client.publish("display/disarm", buffer, n);
-  lcd.print("Armed");
-  delay(5000);
-  lcd.clear();
-}
-
-bool lastReed = 0;
-
 void loop()
 {
     if (!client.connected())
@@ -141,25 +160,5 @@ void loop()
         reconnect();
     }
 
-  bool reed = !digitalRead(REED_ACTIVATION_PIN);
-    
-    if (reed != lastReed)
-    {
-        Serial.print("Reed has changed to: ");
-        Serial.println(reed);
-        
-
-        DynamicJsonDocument doc(1024);
-
-        doc["deviceId"] = deviceId;
-        doc["open"] = reed;
-
-        char buffer[1024];
-        size_t n = serializeJson(doc, buffer);
-        
-        client.publish("door/status", buffer, n);
-        lastReed = reed;
-    }
-
     client.loop();
 }