Diff: source/main.cpp

Revision:

3:38eadab20283

Parent:

1:198b9945994e

Child:

4:49b1aeca55e4

--- a/source/main.cpp	Wed Mar 07 14:39:27 2018 +0000
+++ b/source/main.cpp	Fri Mar 09 16:55:53 2018 +0000
@@ -42,14 +42,17 @@
         advertisementPacket.magnetometer[2] = (int16_t)0;
         
         
-        advertisementPacket.accelerometer[0] = (int16_t)mems.readXAxis()*LSB_VALUE/375;
-        advertisementPacket.accelerometer[1] = (int16_t)mems.readYAxis()*LSB_VALUE/375;
-        advertisementPacket.accelerometer[2] = (int16_t)mems.readZAxis()*LSB_VALUE/375;
+        advertisementPacket.accelerometer[0] = (int16_t)mems.readXAxis()*LSB_VALUE;
+        advertisementPacket.accelerometer[1] = (int16_t)mems.readYAxis()*LSB_VALUE;
+        advertisementPacket.accelerometer[2] = (int16_t)mems.readZAxis()*LSB_VALUE;
+        
+        //advertisementPacket.acc_lsb_value = 0xC000;
+        advertisementPacket.acc_lsb_value = 0x1000;
         
         
-        printf("%d\t", advertisementPacket.accelerometer[0]);
-        printf("%d\t", advertisementPacket.accelerometer[1]);
-        printf("%d\r\n", advertisementPacket.accelerometer[2]);
+        printf("%6d\t", advertisementPacket.accelerometer[0]);
+        printf("%6d\t", advertisementPacket.accelerometer[1]);
+        printf("%6d\r\n", advertisementPacket.accelerometer[2]);
 
         //updatePayload(ble, &advertisementPacket);
         
@@ -116,11 +119,13 @@
     ble.init(bleInitComplete);
     
     mems.setMode(LOW_POWER);
+    //mems.setMode(HIGH_RES);
     mems.enableAxes(X_axis);
     mems.enableAxes(Y_axis);
     mems.enableAxes(Z_axis);    
     mems.setODR(ODR_50Hz);
-    mems.setScale(_16g);
+    //mems.setScale(_16g);
+    mems.setScale(_2g);
     mems.int1Setup(0x40);       // IntActivity 1 driven to INT1 pad
     mems.int1Latch(0x01);       // Enable int1 latch
     mems.int1Threshold(INT1_THRESHOLD);