Diff: main.cpp

Revision:

11:a9f41d6489c9

Parent:

10:f14f47225091

Child:

12:1d544cdab2cf

--- a/main.cpp	Mon May 08 17:13:57 2017 +0000
+++ b/main.cpp	Mon May 08 18:30:12 2017 +0000
@@ -12,6 +12,9 @@
 SensorData data;
 Mutex mutexPCComm;
 Serial pc(USBTX,USBRX);
+
+Serial xbee(D10,D2);//(PB_6, PA_10);
+
 volatile bool sensors_running = false;
 
 static struct task_definition_struct taskList[] = {
@@ -26,6 +29,7 @@
     mutexPCComm.lock();
     pc.printf("MAIN: init\n");
     mutexPCComm.unlock();
+    xbee.putc('S');
     // Init RTC
     time_t epoch_time, elapsed_time;
     epoch_time = rtc.get_epoch();
@@ -55,8 +59,8 @@
     mutexPCComm.lock();
     pc.printf("MAIN: elapsed %ld\n",(long)elapsed_time);
     mutexPCComm.unlock();
-        if(30-elapsed_time>0){
-            Thread::wait((30-elapsed_time)*1000);
+        if(10-elapsed_time>0){
+            Thread::wait((10-elapsed_time)*1000);
         }
     }
 }
@@ -78,6 +82,7 @@
             pc.printf("Hum\t%f\n",data.humidity);
             pc.printf("DewP\t%f\n",data.dewPoint);
             mutexPCComm.unlock();
+            xbee.printf("{DHT:{temp:%4.2f,hum:%4.2f,dew:%4.2f}}\n",data.temperature,data.humidity,data.dewPoint);
         }
         mutexData.unlock();
         if(error!=0) {
@@ -97,10 +102,12 @@
             pc.printf("Hum:\t%f\n",data.humidity);
             pc.printf("DewP:\t%f\n",data.dewPoint);
             pc.printf("DHTError:\t%d\n",data.DHTError);
+            xbee.printf("{DHT:{temp:%4.2f,hum:%4.2f,dew:%4.2f}}\n",data.temperature,data.humidity,data.dewPoint);
             mutexPCComm.unlock();
         } else {
             mutexPCComm.lock();
             pc.printf("DHTError:\t%d\n",data.DHTError);
+            xbee.printf("{DHT:{error:\t%d}}\n",data.DHTError);
             mutexPCComm.unlock();
         }
         mutexData.unlock();