Jurica Resetar / Mbed OS Lizzy

Lizzy project

Dependencies:   aconno_I2C Lis2dh12 adc52832_common aconno_SEGGER_RTT

Files at this revision

API Documentation at this revision

Revision 3:38eadab20283, committed 2018-03-09

Comitter:
dbartolovic
Date:
Fri Mar 09 16:55:53 2018 +0000
Parent:
1:198b9945994e
Child:
4:49b1aeca55e4
Commit message:
Changed full scale to 2g

Changed in this revision

Lis2dh12.lib Show annotated file Show diff for this revision Revisions of this file
aconno_ble/aconno_ble.h Show annotated file Show diff for this revision Revisions of this file
source/main.cpp Show annotated file Show diff for this revision Revisions of this file
source/main.h Show annotated file Show diff for this revision Revisions of this file 
--- a/Lis2dh12.lib	Wed Mar 07 14:39:27 2018 +0000
+++ b/Lis2dh12.lib	Fri Mar 09 16:55:53 2018 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/jurica238814/code/Lis2dh12/#043396f22548
+https://os.mbed.com/users/jurica238814/code/Lis2dh12/#15d1c73137e8

--- a/aconno_ble/aconno_ble.h	Wed Mar 07 14:39:27 2018 +0000
+++ b/aconno_ble/aconno_ble.h	Fri Mar 09 16:55:53 2018 +0000
@@ -25,6 +25,7 @@
             int16_t gyroscope[3];
             int16_t accelerometer[3];
             int16_t magnetometer[3];
+            uint16_t acc_lsb_value;
         };
         struct{
             float temperature;

--- 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); 

--- a/source/main.h	Wed Mar 07 14:39:27 2018 +0000
+++ b/source/main.h	Fri Mar 09 16:55:53 2018 +0000
@@ -18,7 +18,8 @@
 #define PRINT_ON_RTT        (1)
 #define DEBUG_LED           (1)
 #define NANO_MODULE         (0)
-#define LSB_VALUE           (192)
+//#define LSB_VALUE           (192)
+#define LSB_VALUE           (16)
 
 #if NANO_MODULE
     #define I2C_DATA            (p2)