Revision 1:00312af3c20e, committed 2015-07-09

Comitter:

eleim

Date:

Thu Jul 09 17:16:39 2015 +0000

Parent:

0:84ecd53a6958

Child:

2:3779f28a6bf0

Commit message:

090715 18:17;

Changed in this revision

--- a/main.cpp	Thu Jul 09 16:06:05 2015 +0000
+++ b/main.cpp	Thu Jul 09 17:16:39 2015 +0000
@@ -1,9 +1,9 @@
 #include "mbed.h"
 #include "nRF24L01P.h"
 #include "MMA8451Q.h"
-#include <vector>
+#include <list>
 #include <math.h>
-
+#include <queue>
 #define MMA8451_I2C_ADDRESS (0x1d<<1)
 #define TRANSFER_SIZE   24
 
@@ -14,49 +14,48 @@
 
 AnalogIn light_ain(A0);
 AnalogIn temp_ain(A1);
-AnalogIn pir_ain(A3);
+AnalogIn pir_ain(A2);
 
 nRF24L01P my_nrf24l01p(PTD2, PTD3, PTD1, PTE1, PTE0, PTD0);    // mosi, miso, sck, csn, ce, irq
 
 DigitalOut myled1(LED1);
 DigitalOut myled2(LED2);
 
-int light;
-int temp;
-int pir;
+float light;
+float temp;
+float pir;
 
-std::vector<int> light_data;
-std::vector<int> temp_data;
-std::vector<int> pir_data;
+std::list<float> light_data;
+std::list<float> temp_data;
+std::list<float> pir_data;
 
-void getdata()
-{
+
+void getdata() {
     light = light_ain.read();
     temp = temp_ain.read();
     pir = pir_ain.read();
-
-    light_data.push_back (light);
-    temp_data.push_back (temp);
-    pir_data.push_back (pir);
+    
+    light_data.push_back(light);
+    temp_data.push_back(temp);
+    pir_data.push_back(pir);
 
-    light_data.pop_back();
-    temp_data.pop_back();
-    pir_data.pop_back();
-    
-        
-    printf("%f\n", light_data);
-   
+  
+    light_data.pop_front();
+    temp_data.pop_front();
+    pir_data.pop_front();
+    printf("Light reading: %f\n\r", light);  
+    printf("Vector elem: %f\n\r", light_data.front()); 
 }
 
 
 int main()
 {
-
+       
+    light_data.assign(20,0);
+    temp_data.assign(20,0);
+    pir_data.assign(20,0);
     MMA8451Q acc(SDA, SCL, MMA8451_I2C_ADDRESS);
 
-    light_data.assign (20,0);
-    temp_data.assign (20,0);
-    pir_data.assign (20,0);
 
 
     char txData[TRANSFER_SIZE], rxData[TRANSFER_SIZE];