遥菜 井野 / Mbed 2 deprecated SaibiCansat2014_5

cansat

Dependencies:   BMP085 JPEGCamera SDFileSystem mbed

Fork of SaibiCansat2014 by Takashi SASAKI

Files at this revision

API Documentation at this revision

Revision 2:71f75585db19, committed 2014-07-14

Comitter:
TakashiSasaki
Date:
Mon Jul 14 09:42:11 2014 +0000
Parent:
1:31e810237ac1
Child:
3:7ea76022b5eb
Commit message:
corrected printf messages for BMP085 and ADXL345

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Mon Jul 14 09:20:00 2014 +0000
+++ b/main.cpp	Mon Jul 14 09:42:11 2014 +0000
@@ -79,7 +79,7 @@
         
         //BOSH BMP085 Barometric pressure,temperature measurement
         accelerometer.getOutput(readings);
-        pc.printf("\nBOSH BMP085 --------------------\n");
+        pc.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), 
@@ -88,7 +88,7 @@
         bmp085.update();
         
         //ADXL 345 Acceleration measurement
-        pc.printf("ADXL345 ------------------------\n");
+        pc.printf("\nBOSH BMP085 --------------------\n");
         pc.printf("  p:%6.2f hPa / t:%6.2f C\n", bmp085.get_pressure(), bmp085.get_temperature());
         
         //CSDS Ambient light measurement P15 analog-in1