Revision 1:d8ca07afb3ec, committed 2016-01-23

Comitter:

AswinSivakumar

Date:

Sat Jan 23 00:05:52 2016 +0000

Parent:

0:6b858a805a38

Child:

2:01c3a686e169

Commit message:

Added additional sensor libraries;

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MAG3110.lib	Sat Jan 23 00:05:52 2016 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/teams/NXP/code/MAG3110/#f430a728163a

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MMA8652FC/MMA8652.cpp	Sat Jan 23 00:05:52 2016 +0000
@@ -0,0 +1,58 @@
+ /* Copyright (c) 2015 NXP Semiconductors. MIT License
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+* and associated documentation files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or
+* substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "MMA8652.h"
+ #include "mbed.h"
+
+MMA8652::MMA8652(PinName sda, PinName scl) : MMA8652_i2c(sda,scl)
+ {
+       
+ }
+    
+ void MMA8652::MMA8652_config(void)
+ {
+   char d[2]; 
+   d[0] = MMA8652_CTRL_REG1;                     //Puts device in Standby mode
+   d[1] = 0x00; 
+   MMA8652_i2c.write(MMA8652_I2C_ADDRESS, d,2);   
+          
+   
+   d[0] = MMA8652_CTRL_REG1;                     //Puts device in Active mode
+   d[1] = 0x01;
+   MMA8652_i2c.write(MMA8652_I2C_ADDRESS, d,2);   
+      
+ }
+ 
+  
+ 
+ void MMA8652::acquire_MMA8652_data_g(float * a_data)
+ {
+  
+   char data_bytes[7];
+   char d[1];
+   d[0]=MMA8652_STATUS;
+  MMA8652_i2c.write(MMA8652_I2C_ADDRESS,d,1,true);  // Read the 6 data bytes - LSB and MSB for X, Y and Z Axes.
+   MMA8652_i2c.read(MMA8652_I2C_ADDRESS,data_bytes,7);
+   
+   a_data[0] =  ((float)((int16_t)(((data_bytes[1]*256) + (data_bytes[2])))>> 4) * 0.0009765);
+   a_data[1] =  ((float)((int16_t)(((data_bytes[3]*256) + (data_bytes[4])))>> 4) * 0.0009765);
+   a_data[2] =  ((float)((int16_t)(((data_bytes[5]*256) + (data_bytes[6])))>> 4) * 0.0009765);
+   
+ }
+
+     
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MMA8652FC/MMA8652.h	Sat Jan 23 00:05:52 2016 +0000
@@ -0,0 +1,46 @@
+ /* Copyright (c) 2015 NXP Semiconductors. MIT License
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+* and associated documentation files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or
+* substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef MMA8652_H
+#define MMA8652_H
+#include "mbed.h"
+
+#define MMA8652_I2C_ADDRESS (0x1D<<1)
+
+#define MMA8652_STATUS 0x00
+#define MMA8652_WHO_AM_I 0x0D
+#define MMA8652_CTRL_REG1 0x2A
+#define MMA8652_CTRL_REG2 0x2B
+#define MMA8652_WHO_AM_I_VALUE 0x4A
+
+class MMA8652
+{
+    public:
+    
+    MMA8652(PinName sda, PinName scl);
+      
+    void MMA8652_config(void);
+        
+    void acquire_MMA8652_data_g(float * du);
+    
+    private:
+    I2C MMA8652_i2c;
+    
+};
+
+#endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MPL3115A2/MPL3115.cpp	Sat Jan 23 00:05:52 2016 +0000
@@ -0,0 +1,54 @@
+ /* Copyright (c) 2015 NXP Semiconductors. MIT License
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+* and associated documentation files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or
+* substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "MPL3115.h"
+ #include "mbed.h"
+
+MPL3115::MPL3115(PinName sda, PinName scl) : MPL3115_i2c(sda,scl)
+ {
+       
+ }
+    
+ void MPL3115::MPL3115_config(void)
+ {
+   char d[2]; 
+   d[0] = MPL3115_CTRL_REG1;                     //Puts device in Standby mode
+   d[1] = 0x00; 
+   MPL3115_i2c.write(MPL3115_I2C_ADDRESS, d,2);   
+          
+   
+   d[0] = MPL3115_CTRL_REG1;                     //Puts device in Active mode and in altimeter mode
+   d[1] = 0x81;
+   MPL3115_i2c.write(MPL3115_I2C_ADDRESS, d, 2);   
+      
+ }
+ 
+ 
+ 
+ void MPL3115::acquire_MPL3115_data_Altitude_in_m(float * alt_data)
+ {
+  
+   char data_bytes[7];
+   char d[1];
+   d[0]=MPL3115_STATUS;
+   MPL3115_i2c.write(MPL3115_I2C_ADDRESS,d,1,true);  // Read the 6 data bytes - LSB and MSB for X, Y and Z Axes.
+   MPL3115_i2c.read(MPL3115_I2C_ADDRESS,data_bytes,5);
+   alt_data[0]= (float)((short)((data_bytes[1] << 8 ) | data_bytes[2])) + (float)(data_bytes[3]>>4) * 0.0625;
+  
+  
+ }
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MPL3115A2/MPL3115.h	Sat Jan 23 00:05:52 2016 +0000
@@ -0,0 +1,46 @@
+ /* Copyright (c) 2015 NXP Semiconductors. MIT License
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+* and associated documentation files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or
+* substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef MPL3115_H
+#define MPL3115_H
+#include "mbed.h"
+
+#define MPL3115_I2C_ADDRESS (0x60<<1)
+
+#define MPL3115_STATUS 0x00
+#define MPL3115_WHO_AM_I 0x0C
+#define MPL3115_CTRL_REG1 0x26
+#define MPL3115_CTRL_REG2 0x27
+#define MPL3115_WHO_AM_I_VALUE 0xC4
+
+class MPL3115
+{
+    public:
+    
+    MPL3115(PinName sda, PinName scl);
+      
+    void MPL3115_config(void);
+        
+    void acquire_MPL3115_data_Altitude_in_m(float * du);
+    
+    private:
+    I2C MPL3115_i2c;
+    
+};
+
+#endif
\ No newline at end of file

--- 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