Marek Trojan / FXOS8700Q

skm

Dependencies:   MotionSensor

Fork of FXOS8700Q by Jim Carver

Files at this revision

API Documentation at this revision

Revision 10:499c7734bd73, committed 2015-05-22

Comitter:
marcus255
Date:
Fri May 22 11:28:29 2015 +0000
Parent:
7:c53dda05b8cf
Child:
11:ae8d7de91a46
Commit message:
marekMartynaSkm

Changed in this revision

FXOS8700Q.cpp Show annotated file Show diff for this revision Revisions of this file
FXOS8700Q.h Show annotated file Show diff for this revision Revisions of this file
MotionSensor.lib Show annotated file Show diff for this revision Revisions of this file 
--- a/FXOS8700Q.cpp	Fri Apr 25 16:45:51 2014 +0000
+++ b/FXOS8700Q.cpp	Fri May 22 11:28:29 2015 +0000
@@ -123,11 +123,15 @@
 }
 
 
-void FXOS8700Q_acc::getAxis(MotionSensorDataCounts &data) {
+void FXOS8700Q_acc::getAxis(MotionSensorDataCounts &data, uint8_t * scopeData) {
     int16_t acc;
     uint8_t res[6];
     readRegs(FXOS8700Q_OUT_X_MSB, res, 6);
 
+    // added by m255
+    for (uint8_t i = 0; i < 6; i++)
+        scopeData[i] = res[i];
+
     acc = (res[0] << 6) | (res[1] >> 2);
     if (acc > UINT14_MAX/2)
         acc -= UINT14_MAX;

--- a/FXOS8700Q.h	Fri Apr 25 16:45:51 2014 +0000
+++ b/FXOS8700Q.h	Fri May 22 11:28:29 2015 +0000
@@ -96,7 +96,7 @@
     void getX(float * x);
     void getY(float * y);
     void getZ(float * z);
-    void getAxis(MotionSensorDataCounts &data);
+    void getAxis(MotionSensorDataCounts &data, uint8_t * scopeData);
     void getAxis(MotionSensorDataUnits &data);
   
   void readRegs(int addr, uint8_t * data, int len);

--- a/MotionSensor.lib	Fri Apr 25 16:45:51 2014 +0000
+++ b/MotionSensor.lib	Fri May 22 11:28:29 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/components/code/MotionSensor/#4d6e28d4a18a
+http://mbed.org/teams/components/code/MotionSensor/#79ff39e37c5a