Diff: source/main.cpp

Revision:

5:9903738f2587

Parent:

4:49b1aeca55e4

Child:

6:55607d577a42

--- a/source/main.cpp	Fri Mar 09 17:05:05 2018 +0000
+++ b/source/main.cpp	Fri Mar 09 18:09:57 2018 +0000
@@ -42,12 +42,12 @@
         advertisementPacket.magnetometer[2] = (int16_t)0;
         
         
-        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.accelerometer[0] = (int16_t)mems.readXAxis();
+        advertisementPacket.accelerometer[1] = (int16_t)mems.readYAxis();
+        advertisementPacket.accelerometer[2] = (int16_t)mems.readZAxis();
         
         //advertisementPacket.acc_lsb_value = 0xC000;
-        advertisementPacket.acc_lsb_value = 0x1000;
+        advertisementPacket.acc_lsb_value = 0x0100;
         
         
         printf("%6d\t", advertisementPacket.accelerometer[0]);
@@ -76,9 +76,9 @@
             redLed = 0;
         #endif
         ble->gap().startAdvertising();
-        wait_ms(1000);
+        //wait_ms(1000);
         
-        //wait_ms(MEASURE_INTERVAL_MS);
+        wait_ms(MEASURE_INTERVAL_MS);
         //wait_ms(1000);
         
         //printf("Ble advertisement is OFF.\r\n\r\n");
@@ -92,7 +92,7 @@
         advetisementData.updateData(advetisementData.MANUFACTURER_SPECIFIC_DATA, (uint8_t *)&advertisementPacket, sizeof(advertising_packet));
         ble->setAdvertisingData(advetisementData);
         */
-        wait_ms(1000);
+        //wait_ms(100);
     }
 }
 
@@ -118,8 +118,8 @@
     BLE &ble = BLE::Instance();
     ble.init(bleInitComplete);
     
-    mems.setMode(LOW_POWER);
-    //mems.setMode(HIGH_RES);
+    //mems.setMode(LOW_POWER);
+    mems.setMode(HIGH_RES);
     mems.enableAxes(X_axis);
     mems.enableAxes(Y_axis);
     mems.enableAxes(Z_axis);