Fix some dosctrings errors and trailing whitespaces

[contrib/upm.git] / src / mma7455 / mma7455.cxx

diff --git a/src/mma7455/mma7455.cxx b/src/mma7455/mma7455.cxx
index 074ed32..0d79de3 100644 (file)
--- a/src/mma7455/mma7455.cxx
+++ b/src/mma7455/mma7455.cxx
@@ -36,7 +36,7 @@ using namespace upm;
 MMA7455::MMA7455 (int bus, int devAddr) {
     unsigned char data   = 0;
     int           nBytes = 0;
-    
+
     m_name = "MMA7455";
 
     m_controlAddr = devAddr;
@@ -49,7 +49,7 @@ MMA7455::MMA7455 (int bus, int devAddr) {
         fprintf(stderr, "Messed up i2c bus\n");
         return;
     }
-    
+
     // setting GLVL 0x1 (64LSB/g) and MODE 0x1 (Measurement Mode)
     data = (BIT (MMA7455_GLVL0) | BIT (MMA7455_MODE0));
     error = ic2WriteReg (MMA7455_MCTL, &data, 0x1);
@@ -57,7 +57,7 @@ MMA7455::MMA7455 (int bus, int devAddr) {
         std::cout << "ERROR :: MMA7455 instance wan not created (Mode)" << std::endl;
         return;
     }
-    
+
     if (MRAA_SUCCESS != calibrate ()) {
         std::cout << "ERROR :: MMA7455 instance wan not created (Calibrate)" << std::endl;
         return;
@@ -68,63 +68,63 @@ MMA7455::~MMA7455() {
     mraa_i2c_stop(m_i2ControlCtx);
 }
 
-mraa_result_t 
+mraa_result_t
 MMA7455::calibrate () {
     mraa_result_t error = MRAA_SUCCESS;
     int i = 0;
-    
+
     accelData xyz;
     xyz.value.x = xyz.value.y = xyz.value.z = 0;
-    
+
     do {
         error = readData (&xyz.value.x, &xyz.value.y, &xyz.value.z);
         if (MRAA_SUCCESS != error) {
             return error;
         }
-        
+
         xyz.value.x += 2 * -xyz.value.x;
         xyz.value.y += 2 * -xyz.value.y;
         xyz.value.z += 2 * -(xyz.value.z - 64);
-        
+
         error = ic2WriteReg (MMA7455_XOFFL,  (unsigned char *) &xyz, 0x6);
         if (error != MRAA_SUCCESS) {
             return error;
         }
-    
+
     } while ( ++i < 3 );
-    
+
     return error;
 }
 
-mraa_result_t 
+mraa_result_t
 MMA7455::readData (short * ptrX, short * ptrY, short * ptrZ) {
     accelData xyz;
     unsigned char data = 0;
     int nBytes = 0;
-    
+
     /*do {
         nBytes = ic2ReadReg (MMA7455_STATUS, &data, 0x1);
     } while ( !(data & MMA7455_DRDY) && nBytes == MRAA_SUCCESS);
-    
+
     if (nBytes == MRAA_SUCCESS) {
         std::cout << "NO_GDB :: 1" << std::endl;
         return MRAA_SUCCESS;
     }*/
-    
+
     nBytes = ic2ReadReg (MMA7455_XOUTL, (unsigned char *) &xyz, 0x6);
     if (nBytes == 0) {
         std::cout << "NO_GDB :: 2" << std::endl;
         return MRAA_ERROR_UNSPECIFIED;
     }
-    
+
     if (xyz.reg.x_msb & 0x02) {
         xyz.reg.x_msb |= 0xFC;
     }
-    
+
     if (xyz.reg.y_msb & 0x02) {
         xyz.reg.y_msb |= 0xFC;
     }
-    
+
     if (xyz.reg.z_msb & 0x02) {
         xyz.reg.z_msb |= 0xFC;
     }
@@ -133,16 +133,16 @@ MMA7455::readData (short * ptrX, short * ptrY, short * ptrZ) {
     *ptrX = xyz.value.x;
     *ptrY = xyz.value.y;
     *ptrZ = xyz.value.z;
-    
+
     return MRAA_SUCCESS;
 }
 
-int 
+int
 MMA7455::ic2ReadReg (unsigned char reg, unsigned char * buf, unsigned char size) {
     if (MRAA_SUCCESS != mraa_i2c_address(m_i2ControlCtx, m_controlAddr)) {
         return 0;
     }
-    
+
     if (MRAA_SUCCESS != mraa_i2c_write_byte(m_i2ControlCtx, reg)) {
         return 0;
     }
@@ -150,11 +150,11 @@ MMA7455::ic2ReadReg (unsigned char reg, unsigned char * buf, unsigned char size)
     if (MRAA_SUCCESS != mraa_i2c_address(m_i2ControlCtx, m_controlAddr)) {
         return 0;
     }
-    
+
     return (int) mraa_i2c_read(m_i2ControlCtx, buf, size);
 }
 
-mraa_result_t 
+mraa_result_t
 MMA7455::ic2WriteReg (unsigned char reg, unsigned char * buf, unsigned char size) {
     mraa_result_t error = MRAA_SUCCESS;
 
@@ -173,4 +173,3 @@ MMA7455::ic2WriteReg (unsigned char reg, unsigned char * buf, unsigned char size
 
     return error;
 }
-