Revision 2:41a1cdac47a7, committed 2018-03-08

Comitter:

jurica238814

Date:

Thu Mar 08 10:29:22 2018 +0000

Parent:

1:198b9945994e

Child:

4:49b1aeca55e4

Commit message:

Multiplication factor added.

Changed in this revision

--- a/aconno_ble/aconno_ble.h	Wed Mar 07 14:39:27 2018 +0000
+++ b/aconno_ble/aconno_ble.h	Thu Mar 08 10:29:22 2018 +0000
@@ -25,6 +25,7 @@
             int16_t gyroscope[3];
             int16_t accelerometer[3];
             int16_t magnetometer[3];
+            int16_t acc_lsb_value;
         };
         struct{
             float temperature;

--- a/source/main.cpp	Wed Mar 07 14:39:27 2018 +0000
+++ b/source/main.cpp	Thu Mar 08 10:29:22 2018 +0000
@@ -41,16 +41,15 @@
         advertisementPacket.magnetometer[1] = (int16_t)0;
         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();
+        advertisementPacket.accelerometer[1] = (int16_t)mems.readYAxis();
+        advertisementPacket.accelerometer[2] = (int16_t)mems.readZAxis();
+        advertisementPacket.acc_lsb_value = 0xC000;
+        /*
         printf("%d\t", advertisementPacket.accelerometer[0]);
         printf("%d\t", advertisementPacket.accelerometer[1]);
         printf("%d\r\n", advertisementPacket.accelerometer[2]);
-
+        */
         //updatePayload(ble, &advertisementPacket);
         
         /* setup advertising */

--- a/source/main.h	Wed Mar 07 14:39:27 2018 +0000
+++ b/source/main.h	Thu Mar 08 10:29:22 2018 +0000
@@ -15,8 +15,8 @@
 #include "GapAdvertisingData.h"
 
 #define DEBUG               (0)
-#define PRINT_ON_RTT        (1)
-#define DEBUG_LED           (1)
+#define PRINT_ON_RTT        (0)
+#define DEBUG_LED           (0)
 #define NANO_MODULE         (0)
 #define LSB_VALUE           (192)