Diff: main.cpp

Revision:

11:eca6295235e6

Parent:

10:98f119e9582a

Child:

12:a2908fdf3b66

--- a/main.cpp	Mon Sep 26 18:14:20 2016 +0000
+++ b/main.cpp	Mon Sep 26 19:15:11 2016 +0000
@@ -21,6 +21,9 @@
 DigitalOut led4(LED4);
 */
 
+// PART 3
+
+Serial pc(p13, p14); // TX, RX
 
 
 /* PART 8
@@ -55,9 +58,11 @@
 uLCD_4DGL lcd(p13,p14,p12);
 int ax, ay;
 */
-/* PART 9, SD CARD
+
+/*PART 9, SD CARD
 SDFileSystem sd(p5, p6, p7, p8, "sd");
 */
+
 /* PART 9B, SOUND
 float note[16]= {329.628,329.628,329.628,349.228,391.995,391.995,391.995,349.228,
                  329.628,349.228,391.995,349.228,329.628,293.665,329.628,349.228
@@ -78,14 +83,14 @@
     uint16_t sample = 0;
     */
     
-    /* PART 4, BUBBLE
+    // PART 4, BUBBLE, PART 3
     LSM9DS1 imu(p9, p10, 0xD6, 0x3C);
     imu.begin();
     if (!imu.begin()) {
-        lcd.printf("Failed to communicate with imu9DS1.\n");
+        pc.printf("Failed to communicate with imu9DS1.\n");
     }
     imu.calibrate();
-    */
+    
     
     /* PART 9, SD CARD
     mkdir("/sd/mydir", 0777);
@@ -141,18 +146,24 @@
         wait(1.0/8000.0);
         */
         
+        // PART 3
+        
+        
+        imu.readAccel();
+        imu.readMag();
+        imu.readGyro();
+        
+
+        pc.printf("gyro: %d %d %d\n\r", imu.gx, imu.gy, imu.gz);
+        pc.printf("accel: %d %d %d\n\r", imu.ax, imu.ay, imu.az);
+        pc.printf("mag: %d %d %d\n\n\r", imu.mx, imu.my, imu.mz);
+        
         /* PART 4, BUBBLE/COMPASS
         
         imu.readAccel();
         imu.readMag();
         imu.readGyro();
 
-        //lcd.printf("%d %d %d %d %d %d %d %d %d\n\r", imu.calcGyro(imu.gx), imu.calcGyro(imu.gy), imu.calcGyro(imu.gz), imu.ax, imu.ay, imu.az, imu.mx, imu.my, imu.mz);
-        //lcd.printf("%d %d %d\n\r", imu.calcGyro(imu.gx), imu.calcGyro(imu.gy), imu.calcGyro(imu.gz));
-        //lcd.printf("gyro: %d %d %d\n\r", imu.gx, imu.gy, imu.gz);
-        //lcd.printf("accel: %d %d %d\n\r", imu.ax, imu.ay, imu.az);
-        //lcd.printf("mag: %d %d %d\n\n\r", imu.mx, imu.my, imu.mz);
-
         lcd.filled_circle(64 + ax / 250, 64 + ay/ 250 , 8, BLACK);
         ax = imu.ax, ay = imu.ay;
         lcd.filled_circle(64 + ax / 250, 64 + ay/ 250 , 8, WHITE);