Diff: userInteractions.cpp

Revision:

31:eb7320bd1d37

Parent:

29:f96590e6058d

Child:

32:6e0266e7f205

diff -r 673e342f1932 -r eb7320bd1d37 userInteractions.cpp
--- a/userInteractions.cpp	Mon May 09 12:51:37 2016 +0000
+++ b/userInteractions.cpp	Mon May 09 20:03:21 2016 +0000
@@ -1,68 +1,66 @@
-#include "buffer.cpp"
+#include "mailBox.cpp"
+#include "expansionBoard.cpp"
 
 struct tm t;
 
  class UserMethods {
-    Buffer buffer;
   
   public: 
          
     int readAll() {
-        //Check if there are samples
-        int32_t Nsamples = samplesInBuffer->wait();
-        
-        Buffer::log_data log;
-        int count = buffer.newestIndex;
-        int nOfRecords = 0;
+        ExpansionBoard logs;
+        int nOfRecords = logs.count;
         
-        while(count >= buffer.oldestIndex){
-            log = buffer[count];
-            
-            printf("Record %i \nDate: %s, Temp Celcius: %s, Temp Farenheit: %s, Humidity: %s, 
-            "Pressure: , Accelerometer: %s, Gyroscope: %s, Magnetometer: %s\n\n", log->id, 
-            log->date, log->tempCelcius, log->tempFarenheit, log->humidity, 
-            log->pressure, log->accelerometer, log->gyroscope, log->magnetometer);
+        while(nOfRecords > 0) {
+            osEvent evt = mail_box.get();
 
-            count--;
-            nOfRecords++;
+            if (evt.status == osEventMail) {
+                log_data* log = (log_data*)evt.value.p;
+                printf("Record %d \nDate: %s, Temp Celcius: %f, Temp Farenheit: %f, Humidity: %f, "
+                           "Pressure: %f, Accelerometer: %d, Gyroscope: %d, Magnetometer: %d\n\n", log->id,
+                           log->date, log->tempCelsius, log->tempFarenheit, log->humidity,
+                           log->pressure, log->accelerometer, log->gyroscope, log->magnetometer);
+
+                nOfRecords--;
+            }
         }
         
-        return nOfRecords;
+        return logs.count;
     }
 
     int deleteAll() {
-        int n = mail.count;
-        mail.recv_thread(n);
+        int n;
         //int numRecords;
         return n;
     }
 
     int readN(int n) {
-        //Check if there are samples
-        int32_t Nsamples = samplesInBuffer->wait();
-        
-        Buffer::log_data log;
-        int count = buffer.newestIndex;
+        ExpansionBoard logs;
         int nOfRecords = 0;
-        
-        while(count >= n){
-            log = buffer[count];
-            
-            printf("Record %i \nDate: %s, Temp Celcius: %s, Temp Farenheit: %s, Humidity: %s, 
-            "Pressure: , Accelerometer: %s, Gyroscope: %s, Magnetometer: %s\n\n", log->id, 
-            log->date, log->tempCelcius, log->tempFarenheit, log->humidity, 
-            log->pressure, log->accelerometer, log->gyroscope, log->magnetometer);
 
-            count--;
-            nOfRecords++;
+        if(logs.count < n) {
+            nOfRecords = readAll();
+        } else {
+            while(nOfRecords < n) {
+                osEvent evt = mail_box.get();
+                
+                if (evt.status == osEventMail) {
+                    log_data* log = (log_data*)evt.value.p;
+                    printf("Record %d \nDate: %s, Temp Celcius: %f, Temp Farenheit: %f, Humidity: %f, "
+                           "Pressure: %f, Accelerometer: %d, Gyroscope: %d, Magnetometer: %d\n\n", log->id,
+                           log->date, log->tempCelsius, log->tempFarenheit, log->humidity,
+                           log->pressure, log->accelerometer, log->gyroscope, log->magnetometer);
+
+                    nOfRecords--;
+                }
+            }
         }
         
         return nOfRecords;
     }
 
     int deleteN(int n) {
-        mail.recv_thread(n);       
-        //int numRecords;
+
         return n;
     }