Added a pin code for arming and disarming th alarm

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
 	"files.associations": {
+		"*.embeddedhtml": "html",
 		"*.ejs": "html",
 		"*.conf": "cisco",
 		"*.dis": "cpp",
@@ -11,6 +12,18 @@
 		"functional": "cpp",
 		"tuple": "cpp",
 		"type_traits": "cpp",
-		"utility": "cpp"
+		"utility": "cpp",
+		"chrono": "cpp",
+		"algorithm": "cpp",
+		"*.tcc": "cpp",
+		"cmath": "cpp",
+		"random": "cpp",
+		"iosfwd": "cpp",
+		"limits": "cpp",
+		"memory": "cpp",
+		"stdexcept": "cpp",
+		"streambuf": "cpp",
+		"typeinfo": "cpp",
+		"variant": "cpp"
 	}
 }

src/main.cpp

@@ -5,35 +5,52 @@
 #include <ArduinoJson.h>
 
 const int deviceId = 0;
+const char *ssid = "PET Aflytningsvogn #42";
+const char *password = "FuckGFwifi123";
 
-bool alarmIsTriggered = false;
+const char *mqtt_server = "192.168.137.86";
-bool alarmIsArmed = false;
-bool alarmIsDisarmed = false;
-bool alarmIsArming = false;
-bool alarmIsDisarming = false;
 
 unsigned long previousBuzzerMillis = 0;
+unsigned long previousEncoderButtonMillis = 0;
 unsigned long previousButtonMillis = 0;
 bool buzzerStatus = false;
+bool lastEncoderButtonState = false;
 bool lastButtonState = false;
+int pressAmt = 0; //a counter that controls what digit is being written to pin code
+int counter = 1; //controls what number is being written to the pin code
+int lastEncoderState;
+int encoderState;
+bool input = false; //controls whether there is being inputted a pin code or not
+int code[12];
+unsigned long sleep = 0; //controls the amount of time (in miliseconds) an action is delayed
+int wakeUpAct = 0; //controls what to do after set delay
+int alarmStatus = 0;
+bool runCheck = false; //controls whether the inputted pin code in being authenticated or not
+bool passwordReply = false; 
 
-const char *ssid = "PET Aflytningsvogn #43";
-const char *password = "zwr33htm";
 
-const char *mqtt_server = "192.168.24.215";
 
 WiFiClient espClient;
 PubSubClient client(espClient);
 
 int buzzerPin = D0;
-int buttonPin = D5;
+int encoderButtonPin = D5;
 int lcdColumns = 16;
 int lcdRows = 2;
+int encoderPinA = D6;
+int encoderPinB = D7;
+int buttonPin = D3;
+
 
 LiquidCrystal_I2C lcd(0x3f, lcdColumns, lcdRows);
 
 void setup_wifi()
 {
+
+    lcd.clear();
+    lcd.setCursor(3, 0);
+    lcd.print("Connecting");
+
     delay(10);
     // We start by connecting to a WiFi network
     Serial.println();
@@ -52,6 +69,7 @@ void setup_wifi()
     Serial.println("WiFi connected");
     Serial.println("IP address: ");
     Serial.println(WiFi.localIP());
+    lcd.clear();
 }
 
 void reconnect()
@@ -60,12 +78,20 @@ void reconnect()
     while (!client.connected())
     {
         Serial.print("Attempting MQTT connection...");
+        lcd.clear();
+        lcd.print("Attempting MQTT");
+        lcd.setCursor(0,1);
+        lcd.print("connection...");
+
         // Attempt to connect
         if (client.connect("ESP8266Client5"))
         {
+            lcd.clear();
+
             Serial.println("connected");
 
             client.subscribe("alarm/state");
+            client.subscribe("display/passwordResponse");
         }
         else
         {
@@ -78,90 +104,152 @@ void reconnect()
     }
 }
 
-void isArming()
+void showStatus()
-{
-    lcd.clear();
-    lcd.setCursor(0, 0);
-    lcd.print("Arming");
-}
-
-void isArmed()
-{
-    lcd.clear();
-    lcd.setCursor(0, 0);
-    lcd.print("Armed");
-}
-
-void isDisarmed()
 {
-    lcd.clear();
+    if (input == false && runCheck == false)
-    lcd.setCursor(0, 0);
+    {
-    lcd.print("Disarmed");
+        lcd.clear();
-}
+        lcd.setCursor(0, 0);
-
+        lcd.print("Status: ");
-void isTriggered()
+        lcd.setCursor(0, 1);
-{
+        switch (alarmStatus)
-    lcd.clear();
+        {
-    lcd.setCursor(0, 0);
+        case 0:
-    lcd.print("Triggered");
+            lcd.clear();
-}
+            lcd.setCursor(0, 0);
-
+            break;
-void isDisarming()
+        case 1:
-{
+            lcd.print("Arming");
-    lcd.clear();
+            break;
-    lcd.setCursor(0, 0);
+        case 2:
-    lcd.print("Disarmed");
+            lcd.print("Armed");
+            break;
+        case 3:
+            lcd.print("Disarmed");
+            break;
+        case 4:
+            lcd.print("Disarming");
+            break;
+        case 5:
+            lcd.print("Triggered");
+            break;
+        
+        default:
+            break;
+        }
+    }
 }
 
 void callback(char *topic, byte *payload, unsigned int length)
 {
-
-    Serial.print("Message arrived [");
-    Serial.print(topic);
-    Serial.print("] ");
-    for (int i = 0; i < length; i++)
-    {
-        Serial.print((char)payload[i]);
-    }
-    Serial.println();
     StaticJsonDocument<512> doc;
     deserializeJson(doc, payload, length);
-
+  
-    alarmIsTriggered = false;
+    if (strcmp(topic, "display/passwordResponse") == 0 && doc["deviceId"] == deviceId)
-    alarmIsArmed = false;
-    alarmIsDisarmed = false;
-    alarmIsArming = false;
-    alarmIsDisarming = false;
-
-    if (strcmp(doc["status"], "Arming") == 0)
-    {
-        alarmIsArming = true;
-        isArming();
-    }
-    else if (strcmp(doc["status"], "Armed") == 0)
-    {
-        alarmIsArmed = true;
-        isArmed();
-    }
-    else if (strcmp(doc["status"], "Disarmed") == 0)
     {
-        alarmIsDisarmed = true;
+        Serial.print("Message arrived [");
-        isDisarmed();
+        Serial.print(topic);
-    }
+       Serial.print("] ");
-    else if (strcmp(doc["status"], "Disarming") == 0)
+        for (unsigned int i = 0; i < length; i++)
-    {
+        {
-        alarmIsDisarming = true;
+            Serial.print((char)payload[i]);
-        isDisarming();
+        }
+        Serial.println();
+
+        if (doc["correct"] == true)
+        {
+            passwordReply = true;
+            lcd.clear();
+            lcd.setCursor(0,0);
+            lcd.print("Correct pin");
+            wakeUpAct = 1;
+            sleep = millis() + 5000;
+        }
+        else if (doc["correct"] == false)
+        {
+            passwordReply = true;
+            lcd.clear();
+            lcd.setCursor(0,0);
+            lcd.print("Incorrect pin");
+            wakeUpAct = 1;
+            sleep = millis() + 5000;
+        }
     }
-    else if (strcmp(doc["status"], "Triggered") == 0)
+    
+    if (alarmStatus == 0 && strcmp(topic, "alarm/state") == 0)
     {
-        alarmIsTriggered = true;
+
-        isTriggered();
+        if (strcmp(doc["status"], "Arming") == 0)
+        {
+            alarmStatus = 1;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Armed") == 0)
+        {
+            alarmStatus = 2;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Disarmed") == 0)
+        {
+            alarmStatus = 3;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Disarming") == 0)
+        {
+            alarmStatus = 4;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Triggered") == 0)
+        {
+            alarmStatus = 5;
+            showStatus();
+        }
+
+        if (strcmp(doc["status"], "Triggered") != 0) {
+            digitalWrite(buzzerPin, LOW);
+        }
     }
+    else if (strcmp(topic, "alarm/state") == 0 && doc["changed"] == true)
+    {   
+        Serial.print("Message arrived [");
+        Serial.print(topic);
+        Serial.print("] ");
+        for (unsigned int i = 0; i < length; i++)
+        {
+            Serial.print((char)payload[i]);
+        }
+        Serial.println();
+        if (strcmp(doc["status"], "Arming") == 0)
+        {
+            alarmStatus = 1;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Armed") == 0)
+        {
+            alarmStatus = 2;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Disarmed") == 0)
+        {
+            alarmStatus = 3;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Disarming") == 0)
+        {
+            alarmStatus = 4;
+            showStatus();
+        }
+        else if (strcmp(doc["status"], "Triggered") == 0)
+        {
+            alarmStatus = 5;
+            showStatus();
+        }
 
-    if (strcmp(doc["status"], "Triggered") != 0) {
+        if (strcmp(doc["status"], "Triggered") != 0) {
-        digitalWrite(buzzerPin, LOW);
+            digitalWrite(buzzerPin, LOW);
+        }
     }
+    
 }
 
 void setup()
@@ -171,7 +259,12 @@ void setup()
     lcd.init();
     lcd.backlight();
     pinMode(buzzerPin, OUTPUT);
-    pinMode(buttonPin, INPUT_PULLUP);
+    pinMode(buttonPin, INPUT);
+    pinMode(encoderButtonPin, INPUT_PULLUP);
+    pinMode(encoderPinA, INPUT_PULLUP);
+    pinMode(encoderPinB, INPUT_PULLUP);
+
+    lastEncoderState = digitalRead(encoderPinA);
 
     setup_wifi();
     client.setCallback(callback);
@@ -190,38 +283,220 @@ void loop()
 
     unsigned long currentMillis = millis();
 
-    if (currentMillis - previousBuzzerMillis >= 500 && alarmIsTriggered)
+    if (currentMillis - previousBuzzerMillis >= 500 && alarmStatus == 5)
     {
         digitalWrite(buzzerPin, !buzzerStatus);
         buzzerStatus = !buzzerStatus;
         previousBuzzerMillis = currentMillis;
     }
-
+    
+    bool encoderButtonState = !digitalRead(encoderButtonPin);
     bool buttonState = !digitalRead(buttonPin);
 
-    if (buttonState != lastButtonState && currentMillis - previousButtonMillis > 500)
+    if (buttonState != lastButtonState && currentMillis - previousButtonMillis > 200 && buttonState == 1)
     {
         previousButtonMillis = currentMillis;
 
-        if (buttonState)
+        if (input == true && runCheck == true)
+        {
+            if (wakeUpAct == 1)
+            {
+                wakeUpAct = 1;
+                sleep = 1;
+            }
+        }
+        else if (input == true)
         {
-            Serial.println("Button pressed");
+            runCheck = true;
-            DynamicJsonDocument doc(1024);
+            int passLength = 0;
+            if (code[0] != 0)
+            {
+                for (size_t i = 0; i < 12; i++)
+                {
+                    if (code[i] != 0)
+                    {
+                        passLength++;
+                    }
+                }
+            }
+            Serial.println("Done");
+            if (passLength > 3)
+            {
+                int password[passLength];
+                for (int i = 0; i < passLength; i++)
+                {   
+                    password[i] = code[i];
+                }
+                Serial.print("{");
+                for (int i = 0; i < passLength; i++)
+                {
+                    if (i == 0)
+                    {
+                        Serial.print(password[i]);
+                    }
+                    else
+                    {
+                        Serial.print(", ");
+                        Serial.print(password[i]);
+                    }
+                    code[i] = 0;
+                }
+                Serial.println("}");
+                
+                lcd.clear();
+                lcd.setCursor(0,0);
+                lcd.print("Authenticating");
+                lcd.setCursor(0,1);
+                lcd.print("pin");
+
+                DynamicJsonDocument doc(512);
+                doc["deviceId"] = deviceId;
+                for (int i = 0; i < passLength; i++)
+                {
+                    doc["password"][i] = password[i];
+                }
+                
+                char buffer[512];
+                size_t n = serializeJson(doc, buffer);
+                client.publish("display/passwordEntered", buffer, n);
+                wakeUpAct = 2;
+                sleep = currentMillis + 3000;
+            }
+            else
+            {
+                Serial.println("Invalid password entered");
+                lcd.clear();
+                lcd.setCursor(0,0);
+                lcd.print("Invalid pin");
+                wakeUpAct = 1;
+                sleep = currentMillis + 5000;
+            }
+        }
+    }
+    lastButtonState = buttonState;
 
-            doc["deviceId"] = deviceId;
+    encoderState = digitalRead(encoderPinA);
 
-            char buffer[1024];
+    if (encoderState != lastEncoderState && encoderState == 1)
-            size_t n = serializeJson(doc, buffer);
+    {
+        if (input == true && runCheck == true)
+        {
+            if (wakeUpAct == 1)
+            {
+                wakeUpAct = 1;
+                sleep = 1;
+            }
+        }
+        if (digitalRead(encoderPinB) != encoderState) {
+            counter --;
+            if(counter < 1) 
+            {
+                counter = 9;
+            }
+        } else {
+            counter ++;
+            if(counter > 9) 
+            {
+                counter = 1;
+            }
+        }
+        if (input == true && runCheck == false)
+        {
+            lcd.setCursor(0, 1);
+            lcd.print(counter);
+            Serial.println(counter);
+        }
+        
+    }
+    lastEncoderState = encoderState;
 
-            if (alarmIsDisarmed)
+
+
+    if (encoderButtonState != lastEncoderButtonState && currentMillis - previousEncoderButtonMillis > 200)
+    {
+        previousEncoderButtonMillis = currentMillis;
+
+        if (encoderButtonState)
+        {
+            Serial.print("Button pressed ");
+            Serial.println(pressAmt);
+
+            if (input == false)
             {
-                client.publish("display/arm", buffer, n);
+                counter = 1;
+                lcd.clear();
+                lcd.setCursor(0, 0);
+                lcd.print("Key:");
+                lcd.setCursor(0, 1);
+                lcd.print(counter);
+                input = true;
             }
             else
-            {
+            {    
-                client.publish("display/disarm", buffer, n);
+                if (pressAmt > 11)
-            }            
+                {
+                    Serial.println("Max code length");
+                    return;
+                }
+                else
+                {
+                    lcd.setCursor(pressAmt + 4,0);
+                    lcd.print("*");
+
+                    code[pressAmt] = counter;
+
+                    pressAmt++;                
+
+                    if (runCheck == true)
+                    {
+                        if (wakeUpAct ==1)
+                        {
+                            wakeUpAct = 1;
+                            sleep = 1;
+                        }
+                    }
+                }
+            }           
         }
-        lastButtonState = buttonState;
+        lastEncoderButtonState = encoderButtonState;
     }
+    if (currentMillis > sleep && sleep != 0)
+    {
+        Serial.println("I've slept");
+        switch (wakeUpAct)
+        {
+        case 1:
+            input = false;
+            runCheck = false;
+            pressAmt = 0;
+            wakeUpAct = 0;
+            showStatus();
+            for (int i = 0; i < 12; i++)
+            {
+                code[i] = 0;
+            }
+            break;
+        case 2:
+            if (passwordReply == false)
+            {
+                Serial.println("MQTT timeout on password reply");
+                lcd.clear();
+                lcd.setCursor(0,0);
+                lcd.print("Timeout on reply");
+                wakeUpAct = 1;
+                sleep = currentMillis + 5000;
+                return;
+            }
+            else
+            {
+                wakeUpAct = 1;
+                sleep = 1;
+                return;
+            }
+            break;
+        default:
+            break;
+        }
+        sleep = 0;
+    }    
 }