Diff: sensor.cpp

Revision:

26:3aad7d411eb0

Parent:

24:c924342f7c76

--- a/sensor.cpp	Tue May 17 21:38:21 2016 +0000
+++ b/sensor.cpp	Tue May 17 23:19:33 2016 +0000
@@ -5,7 +5,7 @@
 #include "userMethods.h"
 
 Mail<log_data, QUEUESIZE> ExpansionBoard::mail_box;
-vector<log_data> * ExpansionBoard::v;
+std::vector<log_data> ExpansionBoard::v;
 int * ExpansionBoard::n;
 bool ExpansionBoard::flag;
 
@@ -35,9 +35,12 @@
     if(flag) printf("All values STORED\n");
     //Send pointer to sample to the queue
     osStatus stat = mail_box.put(log_d);
-    //v->push_back(*log_d);
+    
+    v.push_back(*log_d);
 
     if(flag) printf("MAIL_BOX.PUT run\n");
+    printf("%d", v.size());
+    printf("Pressure: %f, Humidity: %f", v[0].pressure, v[0].humidity);
     // Check for resource error
     if (stat == osErrorResource) {
         if(flag) printf("mail_box->put() Error %4Xh\n", stat);
@@ -53,18 +56,14 @@
     while(true) {
         //Block on queue if no data is available
         osEvent event = mail_box.get();
-        if(flag) {
-            printf("MAIL_BOX.GET\n");
-        }
+        if(flag) printf("MAIL_BOX.GET\n");
 
         if (event.status == osEventMail) {
             // Successful, store log_data
             log_data* temp = (log_data*) event.value.p;
             v->push_back(*temp);
             mail_box.free(temp);
-            if(flag) {
-                printf("GET value stored and freed up mail_box\n");
-            }
+            if(flag) printf("GET value stored and freed up mail_box\n");
         }
     }
 }
@@ -89,9 +88,9 @@
     return str;
 }
 
-ExpansionBoard::ExpansionBoard(vector<log_data> vector, int num, bool lFlag): T(15.0f)
+ExpansionBoard::ExpansionBoard(int num, bool lFlag): T(15.0f)
 {
-    v = &vector;
+    //v = &vector;
     n = &num;
     flag = &lFlag;