Diff: main.cpp

Revision:

4:05e46365f442

Parent:

3:7ea76022b5eb

Child:

5:8a4b2ffa8d71

--- a/main.cpp	Mon Jul 14 10:02:53 2014 +0000
+++ b/main.cpp	Tue Jul 15 08:22:19 2014 +0000
@@ -81,23 +81,29 @@
         //BOSH BMP085 Barometric pressure,temperature measurement
         accelerometer.getOutput(readings);
         pc.printf("ADXL345 ------------------------\n");
-        xbee.printf("ADXL345 ------------------------\n");
         pc.printf("  %+4.2f, %+4.2f, %+4.2f\n",
             (float((int16_t)readings[0]+18)/256), 
             (float((int16_t)readings[1]-4 )/256), 
             (float((int16_t)readings[2]+22)/256));
+        xbee.printf("  %+4.2f, %+4.2f, %+4.2f\n",
+            (float((int16_t)readings[0]+18)/256), 
+            (float((int16_t)readings[1]-4 )/256), 
+            (float((int16_t)readings[2]+22)/256));
         
         bmp085.update();
         
         //ADXL 345 Acceleration measurement
         pc.printf("\nBOSH BMP085 --------------------\n");
         pc.printf("  p:%6.2f hPa / t:%6.2f C\n", bmp085.get_pressure(), bmp085.get_temperature());
+        xbee.printf("  p:%6.2f hPa / t:%6.2f C\n", bmp085.get_pressure(), bmp085.get_temperature());
         
         //CSDS Ambient light measurement P15 analog-in1
         pc.printf("Ambient light :: %f\n",ain_CDS*100);
+        xbee.printf("Ambient light :: %f\n",ain_CDS*100);
         
         //Humidity measurement P16 analog-in2
         pc.printf("Humidity       :: %f\n",ain_Humedity*100);
+        xbee.printf("Humidity       :: %f\n",ain_Humedity*100);
         
         //LM35DZ Temperature measurement P20 analog-in6
         pc.printf("Temperature    :: %f\n",ain_LM35DZ*100);