Diff: main.cpp

Revision:

3:04bf20362085

Parent:

2:eaf68a908096

Child:

4:17d82b9b8006

--- a/main.cpp	Fri Dec 14 10:24:37 2018 +0000
+++ b/main.cpp	Fri Jul 30 11:17:50 2021 +0000
@@ -55,9 +55,10 @@
     
     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;
+    int16_t gyro_data[3];  float gyro_rms=0.0;
     float alt_data[3];  float alt_rms=0.0;
-       
+    float temp_data[1]; 
+    char data_bytes[7];
     printf("Begin Data Acquisition....\r\n\r\n");
     wait(0.5);
     
@@ -65,25 +66,32 @@
     {
       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,%4.2f,%4.2f,\t",accel_data[0],accel_data[1],accel_data[2]);
-      wait(0.005);
+      //printf("AccX:%4.2f,AccY:%4.2f,AccZ:%4.2f,\t",accel_data[0],accel_data[1],accel_data[2]);
+      printf("%f,%f,%f,",accel_data[0],accel_data[1],accel_data[2]);
+      wait(0.01);
       
          
       mag.acquire_mag_data_uT(mag_data);
-      printf("%4.2f,%4.2f,%4.2f,\t",mag_data[0],mag_data[1],mag_data[2]);
+      //printf("MagX:%4.2f,MagY:%4.2f,MagZ:%4.2f,\t",mag_data[0],mag_data[1],mag_data[2]);
+      printf("%f,%f,%f,",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);
+      wait(0.01);
 
      
- //     gyro.acquire_gyro_data_dps(gyro_data);
-      printf("%4.2f,%4.2f,%4.2f,",gyro.getX(),gyro.getY(),gyro.getZ());
- //     gyro_rms = sqrt(((gyro.getX()*gyro.getX())+(gyro.getY()*gyro.getY())+(gyro.getZ()*gyro.getZ()))/3);
-      wait(0.005);
+//      gyro.acquire_gyro_data_dps(gyro_data);
+      //printf("GyrX:%d,GyrY:%d,GyrZ:%d,\t",gyro.getX(),gyro.getY(),gyro.getZ());
+      printf("%d,%d,%d,",gyro.getX(),gyro.getY(),gyro.getZ());
+//      gyro_rms = sqrt(((gyro.getX()*gyro.getX())+(gyro.getY()*gyro.getY())+(gyro.getZ()*gyro.getZ()))/3);
+      wait(0.01);
       
-      mpl3115.acquire_MPL3115_data_Altitude_in_m(alt_data);
-      printf("\t%f",alt_data[0]);
+      mpl3115.acquire_MPL3115_data_Altitude_in_m(alt_data, temp_data, data_bytes);
+//      mpl3115.acquire_MPL3115_data_Altitude_in_m(alt_data);
+     // printf("Alt:%2f,\tTemp:%2f",alt_data[0],temp_data[0]);
+       printf("%2f,%2f",alt_data[0],temp_data[0]);
+     // printf("\nDatabytes:%s\n", data_bytes);
+//      printf("Alt:%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);
+      wait(0.2);
       
       printf("\n\r");