Tas Lab / MMA8451Q_ss

for speedsensor dasdevelop

Dependents:   BLE_Speedsensor

Files at this revision

API Documentation at this revision

Revision 7:6edc31ecae9e, committed 2015-03-19

Comitter:
tasdevelop
Date:
Thu Mar 19 02:34:30 2015 +0000
Parent:
5:93664a641e43
Commit message:
release tasdevelop

Changed in this revision

MMA8451Q.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 93664a641e43 -r 6edc31ecae9e MMA8451Q.cpp
--- a/MMA8451Q.cpp	Wed Feb 18 08:15:03 2015 +0000
+++ b/MMA8451Q.cpp	Thu Mar 19 02:34:30 2015 +0000
@@ -34,14 +34,9 @@
     writeRegs(data, 2);
 #else
 #define XYZ_DATA_CFG_REG    0x0E
-
-
     uint8_t data2[2] = {XYZ_DATA_CFG_REG, 0x02};    //8G
+    uint8_t data[2] = {REG_CTRL_REG_1, 0x1B};       //100Hz  FastRead
     writeRegs(data2, 2);
-
-//    uint8_t data[2] = {REG_CTRL_REG_1, 0x19};       //100Hz
-    uint8_t data[2] = {REG_CTRL_REG_1, 0x1B};       //100Hz  FastRead
-//    uint8_t data[2] = {REG_CTRL_REG_1, 0x01};
     writeRegs(data, 2);
 #endif
 }
@@ -55,18 +50,27 @@
 }
 
 float MMA8451Q::getAccX() {
-//    return (float(getAccAxis(REG_OUT_X_MSB))/4096.0);
+#if 0
+    return (float(getAccAxis(REG_OUT_X_MSB))/4096.0);
+#else
     return (float(getAccAxis(REG_OUT_X_MSB))/1024.0);
+#endif
 }
 
 float MMA8451Q::getAccY() {
-//    return (float(getAccAxis(REG_OUT_Y_MSB))/4096.0);
+#if 0
+    return (float(getAccAxis(REG_OUT_Y_MSB))/4096.0);
+#else
     return (float(getAccAxis(REG_OUT_Y_MSB))/1024.0);
+#endif
 }
 
 float MMA8451Q::getAccZ() {
-//    return (float(getAccAxis(REG_OUT_Z_MSB))/4096.0);
-   return (float(getAccAxis(REG_OUT_Z_MSB))/1024.0);
+#if 0
+    return (float(getAccAxis(REG_OUT_Z_MSB))/4096.0);
+#else
+    return (float(getAccAxis(REG_OUT_Z_MSB))/1024.0);
+#endif
 }
 
 void MMA8451Q::getAccAllAxis(float * res) {