CODE

Dependencies:   C12832_lcd CMPS03 FatFileSystemCpp GPS MMA7660 mbed

Fork of CompleteMbed by Group 14

Files at this revision

API Documentation at this revision

Comitter:
styles22
Date:
Tue Mar 21 14:17:48 2017 +0000
Parent:
7:2f5cc7f14269
Commit message:
Changed File to output time from gps

Changed in this revision

GPS.lib Show annotated file Show diff for this revision Revisions of this file
MMA7660.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r 2f5cc7f14269 -r 32bb67e3eb06 GPS.lib
--- a/GPS.lib	Wed May 07 10:44:45 2014 +0000
+++ b/GPS.lib	Tue Mar 21 14:17:48 2017 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/simon/code/GPS/#15611c7938a3
+https://developer.mbed.org/teams/Group-141/code/GPS/#582a9a30774e
diff -r 2f5cc7f14269 -r 32bb67e3eb06 MMA7660.lib
--- a/MMA7660.lib	Wed May 07 10:44:45 2014 +0000
+++ b/MMA7660.lib	Tue Mar 21 14:17:48 2017 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/Sissors/code/MMA7660/#a8e20db7901e
+http://mbed.org/users/Sissors/code/MMA7660/#36a163511e34
diff -r 2f5cc7f14269 -r 32bb67e3eb06 main.cpp
--- a/main.cpp	Wed May 07 10:44:45 2014 +0000
+++ b/main.cpp	Tue Mar 21 14:17:48 2017 +0000
@@ -74,9 +74,9 @@
         // GPS code
             if(gps.sample()) 
             {
-                fprintf(GPSFile, "\n%f %f\r\n", gps.latitude, gps.longitude);
+                fprintf(GPSFile, "\n%f     %f\r\n     \n%i", gps.latitude, gps.longitude, gps.stime);
                 lcd.locate(1,1);
-                lcd.printf("GPS: %.4f %.4f", gps.latitude, gps.longitude);
+                lcd.printf("GPS: %.4f %.4f %i", gps.latitude, gps.longitude, gps.stime);
             } 
             else 
             {
@@ -113,4 +113,4 @@
             fclose(GPSFile);  
         }        
     } 
-}
\ No newline at end of file
+}