Diff: main.cpp

Revision:

1:d8ca07afb3ec

Parent:

0:6b858a805a38

Child:

3:9eae869bdf8e

diff -r 6b858a805a38 -r d8ca07afb3ec main.cpp
--- a/main.cpp	Thu Jan 21 08:00:20 2016 +0000
+++ b/main.cpp	Sat Jan 23 00:05:52 2016 +0000
@@ -17,6 +17,9 @@
 */
 #include "FXAS21002.h"
 #include "FXOS8700.h"  
+#include "MAG3110.h"  
+#include "MMA8652.h" 
+#include "MPL3115.h" 
 #include "mbed.h"
 
 // Initialize Serial port
@@ -26,38 +29,67 @@
 FXOS8700 accel(D14,D15);
 FXOS8700 mag(D14,D15);
 FXAS21002 gyro(D14,D15);
+MAG3110 mag3110(D14,D15);
+MMA8652 mma8652(D14,D15);
+MPL3115 mpl3115(D14,D15);
 
+
+    
 int main()
 {
-    // Configure Accelerometer FXOS8700, Magnetometer FXOS8700 & Gyroscope FXAS21002
+
+// Configure Accelerometer FXOS8700, Magnetometer FXOS8700 & Gyroscope FXAS21002
     accel.accel_config();
     mag.mag_config();
     gyro.gyro_config();
-
+    mag3110.MAG3110_config();
+    mma8652.MMA8652_config();
+    mpl3115.MPL3115_config();
+ 
+    
     float accel_data[3]; float accel_rms=0.0;
     float mag_data[3];   float mag_rms=0.0;
     float gyro_data[3];  float gyro_rms=0.0;
+    float alt_data[3];  float alt_rms=0.0;
        
-    printf("Begin Data Acquisition from FXOS8700 and FXAS21002....\r\n\r\n");
+    printf("Begin Data Acquisition....\r\n\r\n");
     wait(0.5);
     
     while(1)
     {
       accel.acquire_accel_data_g(accel_data);
       accel_rms = sqrt(((accel_data[0]*accel_data[0])+(accel_data[1]*accel_data[1])+(accel_data[2]*accel_data[2]))/3);
-      printf("%4.2f,\t%4.2f,\t%4.2f,\t",accel_data[0],accel_data[1],accel_data[2]);
+      printf("%4.2f,%4.2f,%4.2f,\t",accel_data[0],accel_data[1],accel_data[2]);
       wait(0.005);
       
-      mag.acquire_mag_data_uT(mag_data);
-      printf("%4.2f,\t%4.2f,\t%4.2f,\t",mag_data[0],mag_data[1],mag_data[2]);
+     // mma8652.acquire_MMA8652_data_g(accel_data);
+     // accel_rms = sqrt(((accel_data[0]*accel_data[0])+(accel_data[1]*accel_data[1])+(accel_data[2]*accel_data[2]))/3);
+     // printf("%4.2f,%4.2f,%4.2f,\t",accel_data[0],accel_data[1],accel_data[2]);
+     // wait(0.005);
+      
+     // mag.acquire_mag_data_uT(mag_data);
+     // printf("%4.2f,\t%4.2f,\t%4.2f,\t",mag_data[0],mag_data[1],mag_data[2]);
+     // mag_rms = sqrt(((mag_data[0]*mag_data[0])+(mag_data[1]*mag_data[1])+(mag_data[2]*mag_data[2]))/3);
+     // wait(0.005);
+
+      mag3110.acquire_MAG3110_data_uT(mag_data);
+      printf("%f,%f,%f,\t",mag_data[0],mag_data[1],mag_data[2]);
       mag_rms = sqrt(((mag_data[0]*mag_data[0])+(mag_data[1]*mag_data[1])+(mag_data[2]*mag_data[2]))/3);
       wait(0.005);
       
       gyro.acquire_gyro_data_dps(gyro_data);
-      printf("%4.2f,\t%4.2f,\t%4.2f\r\n",gyro_data[0],gyro_data[1],gyro_data[2]);
+      printf("%4.2f,%4.2f,%4.2f,",gyro_data[0],gyro_data[1],gyro_data[2]);
       gyro_rms = sqrt(((gyro_data[0]*gyro_data[0])+(gyro_data[1]*gyro_data[1])+(gyro_data[2]*gyro_data[2]))/3);
       wait(0.005);
       
+      mpl3115.acquire_MPL3115_data_Altitude_in_m(alt_data);
+      printf("\t%f",alt_data[0]);
+      alt_rms = sqrt(((alt_data[0]*alt_data[0])+(alt_data[1]*alt_data[1])+(alt_data[2]*alt_data[2]))/3);
+      wait(0.005);
+      
+      printf("\n\r");
+   
+      
      }
       
 }
\ No newline at end of file