Diff: main.cpp

Revision:

3:9ed8bc1d0da3

Parent:

0:e8167f37725c

--- a/main.cpp	Wed Feb 03 18:24:29 2016 +0000
+++ b/main.cpp	Tue Jun 13 03:51:56 2017 +0000
@@ -1,29 +1,31 @@
 #include "LSM9DS1.h"
+#include <vector>
+using std::vector;
 
 DigitalOut myled(LED1);
 Serial pc(USBTX, USBRX);
 
 int main() {
-    //LSM9DS1 lol(p9, p10, 0x6B, 0x1E);
-    LSM9DS1 lol(p9, p10, 0xD6, 0x3C);
+    //LSM9DS1 lol(D14, D15, 0x6B, 0x1E);
+    LSM9DS1 lol(D14, D15, 0xD6, 0x3C);
+    
+    vector<float> gyro(3, 0.0);
+    vector<float> accel(3, 0.0);
+    
     lol.begin();
     if (!lol.begin()) {
         pc.printf("Failed to communicate with LSM9DS1.\n");
     }
     lol.calibrate();
+    
     while(1) {
-        lol.readTemp();
-        lol.readMag();
-        lol.readGyro();
         
-        //pc.printf("%d %d %d %d %d %d %d %d %d\n\r", lol.calcGyro(lol.gx), lol.calcGyro(lol.gy), lol.calcGyro(lol.gz), lol.ax, lol.ay, lol.az, lol.mx, lol.my, lol.mz);
-        //pc.printf("%d %d %d\n\r", lol.calcGyro(lol.gx), lol.calcGyro(lol.gy), lol.calcGyro(lol.gz));
-        pc.printf("gyro: %d %d %d\n\r", lol.gx, lol.gy, lol.gz);
-        pc.printf("accel: %d %d %d\n\r", lol.ax, lol.ay, lol.az);
-        pc.printf("mag: %d %d %d\n\n\r", lol.mx, lol.my, lol.mz);
-        myled = 1;
-        wait(2);
-        myled = 0;
-        wait(2);
+        lol.readGyroFloatVectorDeg(gyro);
+        lol.readAccelFloatVector(accel);
+        
+        
+        pc.printf("gyro: %.3f %.3f %.3f\n\r", gyro[X_AXIS], gyro[Y_AXIS], gyro[Z_AXIS]);
+        //pc.printf("accel: %f %f %f\n\n\r", accel[X_AXIS], accel[Y_AXIS], accel[Z_AXIS]);
+        
     }
 }