Diff: main.cpp

Revision:

2:2bdf15b94f18

Parent:

1:423c669d0306

Child:

3:51b128605eaa

diff -r 423c669d0306 -r 2bdf15b94f18 main.cpp
--- a/main.cpp	Tue Jun 27 23:01:23 2017 +0000
+++ b/main.cpp	Tue Jun 27 23:29:00 2017 +0000
@@ -5,7 +5,7 @@
 #define tx (PA_9)
 #define rx (PA_10)
 
-const int nodeID = 1;
+const char nodeID = '1';
 
 Serial xb(tx, rx);
 Serial pc(D1, D0);
@@ -14,7 +14,7 @@
 //"id:2,te:2,pr:3,mo:4,uv:5,ir:6,vi:7,no:8"
 void send_sensor_data(int t, int p, int h, int m, int u, int ir, int v, int n){
     //"        id:2, te:%2,pr:%3,mo:%4,uv:%5,ir:%6,vi:%7,no:%8"
-    xb.printf("id:%d,te:%d,pr:%d,hu:%d,mo:%d,uv:%d,ir:%d,vi:%d,no:%d",nodeID,t,p,h,m,u,ir,v,n);
+    xb.printf("id:%c,te:%d,pr:%d,hu:%d,mo:%d,uv:%d,ir:%d,vi:%d,no:%d",nodeID,t,p,h,m,u,ir,v,n);
 }
 
 void send_pir_data(int pir){
@@ -28,19 +28,21 @@
     char buffer[128];
     
     /* Sensor Data
-    format:  "id:2,te:2,pr:3,mo:4,uv:5,ir:6,vi:7,no:8"
+    format:  "ID:2,te:2,pr:3,mo:4,uv:5,ir:6,vi:7,no:8"
     
     
     */
     
-    int temp = 0;
-    int pressure = 0;
-    int humidity = 0;
-    int motion = 0;
-    int uv = 0;
-    int ir = 0;
-    int vis = 0;
-    int noise = 0;
+    int temp = 1;
+    int pressure = 2;
+    int humidity = 3;
+    int motion = 4;
+    int uv = 5;
+    int ir = 6;
+    int vis = 7;
+    int noise = 8;
+    
+    bool send_enable = false;
         
     while(true){
         if(pc.readable()){
@@ -50,12 +52,22 @@
         }
         
         if(xb.readable()){
-            xb.gets(buffer, 4);
-            pc.printf("%s", buffer);   
+            xb.gets(buffer, 5);
+            pc.printf("%s", buffer);
+            
+            /*for(int i = 0; i < 5; i++){
+                pc.printf("%c",buffer[i]);
+                wait(0.1);   
+            }*/
+            
+            if(buffer[3] == nodeID){
+                send_enable = true;
+            }
         }
         
-        if(xb.writeable()){
+        if(xb.writeable() && send_enable){
             send_sensor_data(temp, pressure, humidity, motion, uv, ir, vis, noise);
+            send_enable = false;
         }
     }
 }