Diff: main.cpp

Revision:

8:412307ba78b0

Parent:

7:46da94ccfa67

Child:

9:934cae7f3290

--- a/main.cpp	Thu Aug 06 14:32:56 2015 +0000
+++ b/main.cpp	Sat Aug 08 12:41:56 2015 +0000
@@ -2,6 +2,7 @@
 #include "math.h"
 
 Serial pc (USBTX, USBRX);
+Serial xbee (PTE0, PTE1);
 
 const int ARRAY_LENGTH    = 500;
 float temperature_celsius, temperature_voltage, light_voltage, raw_pir_reading, noise_voltage, noise_maximum, noise_average, noise_total, noise_variance, noise_sd, presence_percentage, num_consecutive_runs;
@@ -29,8 +30,10 @@
     light_voltage = light_ain.read_u16();
 
     sprintf(publishString,"%.1f, %.1f, %.1f, %.1f, %.1f", temperature_celsius, light_voltage, noise_maximum, noise_average, noise_variance);
+    xbee.printf(publishString);
     //Spark.publish("measurements", publishString);
     sprintf(publishString, "%.1f, %.1f", presence_percentage, num_consecutive_runs);
+     xbee.printf(publishString);
     //Spark.publish("measurements", publishString);
 }
 
@@ -103,17 +106,11 @@
 
 
 int main() {
-    while (1) {
-         temperature_voltage = temp_ain.read_u16();
-         pc.printf("%f \n", temperature_voltage);
-         
-         light_voltage = light_ain.read_u16();
-         pc.printf("%f \n", light_voltage);
-         wait(2);
-        
-  //  measure_pir_and_noise();
-   // noise_analysis();
-   // pir_analysis();
-   // publish_measurements();
+    while (1) {        
+  measure_pir_and_noise();
+  noise_analysis();
+  pir_analysis();
+  publish_measurements();
+  
 }
 }
\ No newline at end of file