Diff: main.cpp

Revision:

8:1703f45edfa2

Parent:

7:6ee530637c90

Child:

9:e619711e05be

--- a/main.cpp	Wed Jul 05 23:58:11 2017 +0000
+++ b/main.cpp	Thu Jul 06 00:27:22 2017 +0000
@@ -57,13 +57,13 @@
 }
 
 int main() {
-    pc.printf("echo!!\n\r");
+    pc.printf("\n\rMic test 1-2, 1-2\n\r");
         
     // Attach the PIR function to interrupt
     //MotionDetect.rise(&PIR);
     
     char pc_data = 'e';
-    char buffer[5];
+    char buffer[6];
         
     int temp = 1;
     int pressure = 2;
@@ -74,9 +74,10 @@
     int noise = 8;
     
     bool send_enable = false;
-        
+            
     while(true){
         // Debug Controls Input
+        
         if(pc.readable()){
             pc_data = pc.getc();
             pc.printf("PC: %c", pc_data);
@@ -93,25 +94,10 @@
             } 
         }
         
-        
-        //Read in data from XBee
-        /*
-        if(xb.readable()){
-            wait(0.01);
-            xb.gets(buffer, 6);
-            pc.printf("recv: %s\n\r", buffer);
-            
-            if((buffer[4] == nodeID) || (buffer[3] == nodeID) || (buffer[2] == nodeID) || (buffer[1] == nodeID)){
-                send_enable = true;
-            }
-            memset(buffer, '\0', sizeof(buffer));
-        }*/
-        
-        
         // testing out using getc() instead of gets()
         if(xb.readable()){
             wait(0.01);
-            for(int i = 0; i < 5; i++){
+            for(int i = 0; i < sizeof(buffer); i++){
                 buffer[i] = xb.getc();
                 pc.printf("%c",buffer[i]);
             }
@@ -120,6 +106,10 @@
             if((buffer[4] == nodeID)){
                 send_enable = true;
             }
+            for(int i = 0; i < sizeof(buffer); i++){
+                pc.printf("%i,", buffer[i]);
+            }
+            pc.printf("\r\n");
             memset(buffer, '\0', sizeof(buffer));
         }