Merge pull request #1 from unbiot/master

Fix bug in acceleration sensor measurement
ameltech · Dec 13, 2015 · 4466c21 · 4466c21
2 parents 1a354cd + f0a87d3
commit 4466c21
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/examples/sme9Axis/Accelerometer/Accelerometer.ino b/examples/sme9Axis/Accelerometer/Accelerometer.ino
@@ -21,6 +21,7 @@
 
 // the setup function runs once when you press reset or power the board
 void setup() {
+    Wire.begin();
     smeAccelerometer.begin();
     SerialUSB.begin(115200);
 }

diff --git a/examples/sme9Axis/Gyroscpe/Gyroscpe.ino → examples/sme9Axis/Gyroscope/Gyroscope.ino b/examples/sme9Axis/Gyroscpe/Gyroscpe.ino → examples/sme9Axis/Gyroscope/Gyroscope.ino
@@ -21,6 +21,7 @@
 
 // the setup function runs once when you press reset or power the board
 void setup() {
+    Wire.begin();
     smeGyroscope.begin();
     SerialUSB.begin(115200);
 }

diff --git a/examples/sme9Axis/Magnetic/Magnetic.ino b/examples/sme9Axis/Magnetic/Magnetic.ino
@@ -21,6 +21,7 @@
 
 // the setup function runs once when you press reset or power the board
 void setup() {
+    Wire.begin();
     smeMagnetic.begin();
     SerialUSB.begin(115200);
 }

diff --git a/src/accelerometer/LSM9DS1.cpp b/src/accelerometer/LSM9DS1.cpp
@@ -171,7 +171,7 @@ int
 LSM9DS1_A::readZ()
 {
     int data = 0;
-    if (readInternal(AG_ACC_Z_H, AG_ACC_Y_L, &data)) {
+    if (readInternal(AG_ACC_Z_H, AG_ACC_Z_L, &data)) {
         _z = data;
     }
     // Decode Accel z-axis  [mdps measurement unit]
@@ -295,7 +295,7 @@ LSM9DS1_M::activate(void)
     return true;
 }
 
-bool 
+bool
 LSM9DS1_M::deactivate(void)
 {
     uint8_t data;