Diff: main.cpp

Revision:

20:5a4e47822d79

Parent:

18:76f4fc030036

Child:

21:b165e847c5ba

--- a/main.cpp	Thu Aug 18 23:31:02 2016 +0000
+++ b/main.cpp	Fri Aug 19 02:22:15 2016 +0000
@@ -52,7 +52,7 @@
 myGPS.sendCommand(UBX_DISABLE_GSA);
 
 
-pc.baud(9600);
+pc.baud(115200);
 
 acc.enable();
 pc.printf("\r\n\nFXOS8700Q Who Am I= %X\r\n", acc.whoAmI());
@@ -78,7 +78,12 @@
 }
 */
 //OLED96.fillScreen(BLACK);
-OLED96.printf("Hello from Hexi");
+OLED96.printf("Hello from Hexi\n");
+OLED96.printf("I am alive now\n");
+OLED96.printf("I am going to be\n");
+OLED96.printf("a GPS-AHRS \n");
+OLED96.printf("for Nikon D800");
+
 
 /*
 OLED96.open();
@@ -92,7 +97,7 @@
 //BOOSTEN = 0;
 
     while (true) {
-        
+        /*
         acc.getAxis(acc_data);
         mag.getAxis(mag_data);
         gyro.ReadXYZ(gyro_data);
@@ -120,14 +125,12 @@
         pc.printf("FXOS8700Q ACC: X=%d Y=%d Z=%d  ", raX, raY, raZ);
         pc.printf("    MAG: X=%d Y=%d Z=%d\r\n\n", rmX, rmY, rmZ);
         
-        /*
-        while(gps.readable())
-        { 
-            c = myGPS.read();   //queries the GPS
-    
-            if (c) {
-                pc.printf("%c", c);    //this line will echo the GPS data if not paused
-            }
+        */
+        
+        c = myGPS.read();   //queries the GPS
+
+        if (c) {
+            pc.printf("%c", c);    //this line will echo the GPS data if not paused
         }
 
         //check if we recieved a new message from GPS, if so, attempt to parse it,
@@ -136,8 +139,5 @@
                 continue;
             }
         }
-        */
-        
-        wait(0.1);
     }
 }