Diff: MMA8452.h

Revision:

6:f6bde04bf8be

Parent:

5:b3d0abd97e55

Child:

8:89272163f395

diff -r b3d0abd97e55 -r f6bde04bf8be MMA8452.h
--- a/MMA8452.h	Wed Oct 16 18:55:16 2013 +0000
+++ b/MMA8452.h	Thu Oct 17 09:41:35 2013 +0000
@@ -115,11 +115,6 @@
 #define SR_STATUS 0x08          // Auto-Wake and Active Mode Portrait/Landscape Samples per Seconds Register (Read/Write)
 #define PDET_STATUS 0x09        // Tap/Pulse Detection Register (Read/Write)
 #define PD_STATUS 0xA           // Tap/Pulse Debounce Count Register (Read/Write)
-
-
-
-
-
  
 class Accelerometer_MMA8452         
 {        
@@ -139,9 +134,7 @@
         *
         */
       ~Accelerometer_MMA8452();
-      
-      
-      
+            
       /** Get system mode of the MMA8452 (not required)
         *   returns 0 for success in reading the system mode of the chip
         *   returns 1 for failure in reading the system mode of the chip
@@ -152,7 +145,6 @@
       int get_SystemMode(int& deviceSystemMode);
       
       
-      
       /** Get status of the MMA8452 (not required)
         *   returns 0 for success in reading the status of the chip
         *   returns 1 for failure in reading the status of  the chip
@@ -163,7 +155,6 @@
         *   
       */
       int get_Status(int& deviceStatus);
-     
       
       
       /** Activate the MMA8452 (required)
@@ -176,7 +167,6 @@
       int activate();
  
  
- 
        /** Standby the MMA8452 (not required)
         *   returns 0 for success in activating the chip
         *   returns 1 for failure in activating the chip
@@ -195,7 +185,7 @@
         *   This will return the state of the control register 1. This holds and sets values for auto wake, sleep mode
         *   output data rate, fast read mode and active/standby. More info on 6.7 of pdf for MMA8452 Freescale doc.
       */
-      int get_CTRL_Reg1(int& CTRL_Reg); 
+      int get_CTRL_Reg1(int* CTRL_Reg);
       
       
        /** Initialization of device MMA8452 (required)
@@ -259,6 +249,8 @@
     private:
       I2C m_i2c;
       int m_frequency;
+      int _readAddress;
+      int _writeAddress;
          
 };