Revision 6:167e50d4be75, committed 2017-02-22

Comitter:

mireyarod23

Date:

Wed Feb 22 05:06:49 2017 +0000

Parent:

5:8c00640cc051

Child:

7:2a107e6e0df4

Commit message:

Changes;

Changed in this revision

--- a/MMA8451Q.cpp	Mon Feb 20 08:56:43 2017 +0000
+++ b/MMA8451Q.cpp	Wed Feb 22 05:06:49 2017 +0000
@@ -28,12 +28,9 @@
 #define UINT14_MAX        16383
 #define MAX_2G            0x00
 #define MAX_4G            0X01
-#define MAX_8G            0X10
+#define MAX_8G            0X02
 
 #define GSCALING          1024.0
-#define                            //define property that will return all bits
-
-
 
 MMA8451Q::MMA8451Q(PinName sda, PinName scl, int addr) : m_i2c(sda, scl), m_addr(addr) {
     // activate the peripheral
@@ -43,7 +40,7 @@
 
 void MMA8451Q::setGLImit()
 {
-    uint8_t data[2] = {EEG_CTRL_REG_1, 0X00};
+    uint8_t data[2] = {REG_CTRL_REG_1, 0X00};
     writeRegs(data, 2); //put in standby
     data[0] = XYZ_DATA_CFG;
     data[1] = 0x02;
@@ -84,7 +81,7 @@
     uint8_t res[2];
     readRegs(addr, res, 2);
 
-    acc = (res[0] << 6) | (res[1] >> 2);
+    acc = (res[0] << 6) | (res[1] >> 2); 
     if (acc > UINT14_MAX/2)
         acc -= UINT14_MAX;
 
@@ -99,7 +96,4 @@
 
 void MMA8451Q::writeRegs(uint8_t * data, int len) {
     m_i2c.write(m_addr, (char *)data, len);
-
-    //return the values to be able to read
-    return {m_addr, (char *) data, len};
 }

--- a/MMA8451Q.h	Mon Feb 20 08:56:43 2017 +0000
+++ b/MMA8451Q.h	Wed Feb 22 05:06:49 2017 +0000
@@ -96,14 +96,15 @@
    *
    * @param res array where acceleration data will be stored
    */
-  void getAccAllAxis(float * res);
-
+  void getAccAllAxis(float * res); 
+  
+  int16_t getAccAxis(uint8_t addr);
+  
 private:
   I2C m_i2c;
   int m_addr;
   void readRegs(int addr, uint8_t * data, int len);
   void writeRegs(uint8_t * data, int len);
-  int16_t getAccAxis(uint8_t addr);
 
 };