Diff: main.cpp

Revision:

6:4b1ecb3a95c5

Parent:

5:ad41288051e7

Child:

7:6ee530637c90

diff -r ad41288051e7 -r 4b1ecb3a95c5 main.cpp
--- a/main.cpp	Fri Jun 30 18:58:17 2017 +0000
+++ b/main.cpp	Wed Jul 05 21:24:02 2017 +0000
@@ -47,18 +47,12 @@
 }
 
 void SendPirFlag(){
-    xb.printf("id:%c,mo:1\r\n",nodeID);
+    xb.printf("ni:%c,mo:1\r\n",nodeID);
 }
 
 // PIR interrupt. Set the pir_trigger to true when interrupted.
 void PIR(void){
-    /*
-    if(pir_trigger){
-        pc.printf("DOUBLE TROUBLE\r");
-    } else {
-        pc.printf("PIR TRIGGER\r");
-    }
-    */
+    
     pir_trigger = true;
 }
 
@@ -85,28 +79,40 @@
         // Debug Controls Input
         if(pc.readable()){
             pc_data = pc.getc();
-            pc.printf("%c", pc_data);
+            pc.printf("PC: %c", pc_data);
             if(xb.writeable()){xb.printf("%c", pc_data);}
         }
-        /*
+        
         if(pir_trigger){
             // DEBUG
             //pc.printf("pir_trigger TRUE\r\n");
-            if(xb.writeable()){SendPirFlag();} 
-            pir_trigger = false;  
+            if(xb.writeable()){
+                SendPirFlag();
+                pir_trigger = false;
+                pc.printf("PIR FLAG \r\n");
+            } 
         }
-        */
+        
         
         //Read in data from XBee
         if(xb.readable()){
-            xb.gets(buffer, 10);
+            wait(0.01);
+            xb.gets(buffer, 6);
             pc.printf("recv: %s\n\r", buffer);
             
-            if((buffer[3] == nodeID) || (buffer[2] == nodeID) || (buffer[1] == nodeID) || (buffer[0] == nodeID)){
+            if((buffer[4] == nodeID) || (buffer[3] == nodeID) || (buffer[2] == nodeID) || (buffer[1] == nodeID)){
                 send_enable = true;
-            } else {
-                send_enable = false;   
             }
+            
+            pc.printf("test after check");
+            
+            // TODO: CODE WORKS IF WE SEND IT '1111', BUT NOT IF WE SEND 'ID:1'
+            // TODO: unf*** the code
+            /*
+            if((buffer[3] == nodeID)){
+                send_enable = true;
+            }*/
+            
             memset(buffer, '\0', sizeof(buffer));
         }