From 108622e8df6b24733b177bf8b2cf319c4e0a3871 Mon Sep 17 00:00:00 2001
From: AakashKumar21 <aakashk.kvjp58@gmail.com>
Date: Sat, 27 Oct 2018 20:37:55 +0530
Subject: [PATCH] added led alarm

---
 IOT/.vscode/.BROWSE.C_CPP.2.DB | Bin 13692928 -> 13692928 bytes
 IOT/src/main.cpp               |  95 ++++++++++++++++++++++++---------
 2 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/IOT/.vscode/.BROWSE.C_CPP.2.DB b/IOT/.vscode/.BROWSE.C_CPP.2.DB
index 153e4ab998da57795831a6dac3d2950c91fce576..a1f5dcbf4aef92d868a9f51164d3daee40ee3b86 100644
GIT binary patch
delta 2875
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
Lt9{#}hdKTS!3^R1

delta 2498
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

diff --git a/IOT/src/main.cpp b/IOT/src/main.cpp
index 030f781..f1b345e 100644
--- a/IOT/src/main.cpp
+++ b/IOT/src/main.cpp
@@ -52,6 +52,7 @@ unsigned long prev;
 unsigned long now;
 unsigned long timer;
 bool parse_success = true;
+bool calculated;
 int reminders;
 int reps;
 bool button_pressed = false;
@@ -72,6 +73,10 @@ pinMode(interruptPin, INPUT_PULLUP);
 pinMode(r,OUTPUT);
 pinMode(g,OUTPUT);
 pinMode(b,OUTPUT);
+digitalWrite(r,0);
+digitalWrite(g,0);
+digitalWrite(b,0);
+
 attachInterrupt(digitalPinToInterrupt(interruptPin), handleInterrupt, FALLING);
 WiFi.begin(WLAN_SSID, WLAN_PASS);
 while (WiFi.waitForConnectResult() != WL_CONNECTED) {
@@ -124,6 +129,8 @@ void loop() {
     MQTT_connect();
     Adafruit_MQTT_Subscribe *subscription;
     while ((subscription = mqtt.readSubscription(3000) )) {
+    button_pressed = false;
+    calculated=false;
     subscription = mqtt.readSubscription(3000);
     data_json = (char*)t1.lastread;
     Serial.print("\nlastread: ");
@@ -150,22 +157,14 @@ void loop() {
             str = "t2";
             reminder[1].hour = data[str][0];
             reminder[1].minute = data[str][1];
-            Serial.printf("reminder[1]: %dhour %dmin\n",reminder[1].hour,reminder[0].minute);
+            Serial.printf("reminder[1]: %dhour %dmin\n",reminder[1].hour,reminder[1].minute);
 
           //For reminder 3
             Serial.println("\nReminder 3 :-");
             str = "t3";
             reminder[2].hour = data[str][0];
             reminder[2].minute = data[str][1];
-            Serial.printf("reminder[2]: %dhour %dmin\n",reminder[2].hour,reminder[0].minute);
-
-            for(int i=0;i<=3;i++)
-            {
-              reminder[i].endtime = reminder[i].timeleft*60 + 30;
-            }
-
-          // Alarm Function
-
+            Serial.printf("reminder[2]: %dhour %dmin\n",reminder[2].hour,reminder[2].minute);
           if_parsed = true;
         }
         
@@ -174,15 +173,25 @@ void loop() {
         {
           
           reminder[0].timeleft = reminder[0].hour*60 + reminder[0].minute- time_in_min();
-          reminder[1].timeleft = reminder[1].hour*60 + reminder[1].minute -  time_in_min();
+          reminder[1].timeleft = reminder[1].hour*60 + reminder[1].minute - time_in_min();
           reminder[2].timeleft = reminder[2].hour*60 + reminder[2].minute - time_in_min();
-          if(reminder[0].timeleft<0) reminder[0].timeleft = reminder[0].timeleft*(-1) + 1440;
-          if(reminder[1].timeleft<0) reminder[1].timeleft = reminder[1].timeleft*(-1) + 1440;
-          if(reminder[2].timeleft<0) reminder[2].timeleft = reminder[2].timeleft*(-1) + 1440;
-          Serial.println("Timeleft");
+          //if(reminder[0].timeleft<0) reminder[0].timeleft = reminder[0].timeleft*(-1) + 1440;
+          //if(reminder[1].timeleft<0) reminder[1].timeleft = reminder[1].timeleft*(-1) + 1440;
+          //if(reminder[2].timeleft<0) reminder[2].timeleft = reminder[2].timeleft*(-1) + 1440;
+          Serial.println("\nTimeleft");
           Serial.printf("%dmin\n", reminder[0].timeleft);
           Serial.printf("%dmin\n", reminder[1].timeleft);
-          Serial.printf("%dmin\n",reminder[2].timeleft);
+          Serial.printf("%dmin\n", reminder[2].timeleft);
+          if(!calculated){
+            for(int i=0;i<=2;i++)
+              {
+                reminder[i].endtime = reminder[i].hour*60 +  reminder[i].minute + 10;
+                Serial.print("End Times");
+                Serial.printf("%d %d\n", reminder[i].endtime/60 ,reminder[i].endtime%60);
+              }
+              
+              calculated = true;
+          }
           trigger(reminder[0].timeleft,reminder[1].timeleft,reminder[2].timeleft);
         }
 
@@ -233,7 +242,8 @@ void MQTT_connect() {
 }
 
 void handleInterrupt() {
-  Serial.println("Hello");
+  button_pressed = true;
+  Serial.println("INTEEUPT");
 }
 
 int time_in_min()
@@ -246,14 +256,49 @@ long time_in_sec()
  return timeClient.getHours()*60*60 + timeClient.getMinutes()*60 + timeClient.getSeconds();
 }
 
-void trigger(int a, int b, int c)
+void trigger(int a, int bx, int c)
 {
-  if(button_pressed) return;
-  if(long(a*60) >= time_in_sec()) digitalWrite(r,!1);
-  if(long(b*60) >= time_in_sec()) digitalWrite(g,!1);
-  if(long(c*60) >= time_in_sec()) digitalWrite(b,!1);
+  if(button_pressed) 
+  {
+    Serial.println("Button Pressed");
+    Serial.println("R1 De-Triggered");
+    digitalWrite(r,0);
+    Serial.println("R2 De-Triggered");
+    digitalWrite(g,0);
+    Serial.println("R3 De-Triggered");
+    digitalWrite(b,0);
+    return;
+  }
+  if(a <= 1 ) 
+  {
+    Serial.println("R1 Triggered");
+    digitalWrite(r,1);
+  }
+  if(bx <= 1) 
+  {
+    Serial.println("R2 Triggered");
+    digitalWrite(g,1);
+  }
+  if(c <= 1)
+  { 
+    Serial.println("R3 Triggered");
+    digitalWrite(b,1);
+  }
 
-  if( (long)reminder[0].endtime > time_in_sec()) digitalWrite(r,!0);
-  if( (long)reminder[1].endtime > time_in_sec()) digitalWrite(g,!0);
-  if( (long)reminder[2].endtime > time_in_sec()) digitalWrite(b,!0);
+  /************** De-trigger ***************/
+  if( reminder[0].endtime <= time_in_min())
+  { 
+    Serial.println("R1 De-Triggered");
+    digitalWrite(r,0);
+  }
+  if( reminder[1].endtime <= time_in_min())
+  { 
+    Serial.println("R2 De-Triggered");
+    digitalWrite(g,0);
+  }
+  if( reminder[2].endtime <= time_in_min())
+  { 
+    Serial.println("R3 De-Triggered");
+    digitalWrite(b,0);
+  }
 }
\ No newline at end of file