fix libs

Dependencies:   mbed FXOS8700 FXAS21002 MPL3115A2

Files at this revision

API Documentation at this revision

Comitter:
ikorolev
Date:
Fri Dec 14 10:24:37 2018 +0000
Parent:
1:835b21f32a6e
Commit message:
fix libs

Changed in this revision

FXAS21002.lib Show annotated file Show diff for this revision Revisions of this file
FXOS8700.lib Show annotated file Show diff for this revision Revisions of this file
FXOS8700_FXAS21002.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FXAS21002.lib	Fri Dec 14 10:24:37 2018 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/teams/MSS/code/FXAS21002/#8461f7fe0a7f
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FXOS8700.lib	Fri Dec 14 10:24:37 2018 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/AswinSivakumar/code/FXOS8700/#df2167370234
--- a/FXOS8700_FXAS21002.lib	Wed Apr 26 00:11:53 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://developer.mbed.org/teams/NXP/code/FXOS8700_FXAS21002/#53f5b20535b4
--- a/main.cpp	Wed Apr 26 00:11:53 2017 +0000
+++ b/main.cpp	Fri Dec 14 10:24:37 2018 +0000
@@ -38,7 +38,7 @@
 // Initialize pins for I2C communication for sensors. Set jumpers J6,J7 in FRDM-STBC-AGM01 board accordingly.
 FXOS8700 accel(PTC2,PTC1);
 FXOS8700 mag(PTC2,PTC1);
-FXAS21002 gyro(PTC2,PTC1);
+FXAS21002 gyro(PTC2,PTC1,0x20);
 MPL3115 mpl3115(PTC2,PTC1);
 
 
@@ -49,7 +49,7 @@
 // Configure Accelerometer FXOS8700, Magnetometer FXOS8700 & Gyroscope FXAS21002
     accel.accel_config();
     mag.mag_config();
-    gyro.gyro_config();
+//    gyro.gyro_config();
     mpl3115.MPL3115_config();
  
     
@@ -75,9 +75,9 @@
       wait(0.005);
 
      
-      gyro.acquire_gyro_data_dps(gyro_data);
-      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);
+ //     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);
       
       mpl3115.acquire_MPL3115_data_Altitude_in_m(alt_data);