Diff: main.cpp

Revision:

11:a9c16968e7f6

Parent:

10:349d4fa9037f

Child:

12:a895e3581542

--- a/main.cpp	Sat Jul 01 12:31:17 2017 +0000
+++ b/main.cpp	Sat Jul 01 16:48:47 2017 +0000
@@ -21,8 +21,8 @@
 char gpsfix_course[7] = {0};    //Set but not used
 char gpsfix_variation[7] = {0}; //Set but not used
 char gpsfix_mag_var_ew[1] = {0};//Set but not used
-char gpsfix_ns[1] = {0};
-char gpsfix_ew[1] = {0};
+char gpsfix_ns = 0;
+char gpsfix_ew = 0;
 
 
 void gps_power(bool state)
@@ -72,7 +72,10 @@
                 pc.printf( " %s\n\r", token );  //Get the time
                 if (token != NULL) {
                     token = strtok(NULL, ",");
-                    pc.printf("Time: %s\n\r",token);
+                    if (*token != 32){          //If there is a time present, record it.
+                        pc.printf("Time: %s\n\r",token);
+                        memcpy(gpsfix_last_utc_time, token, sizeof gpsfix_last_utc_time - 1);
+                    }
                 }
                 if (token != NULL) {
                     token = strtok(NULL, ",");
@@ -88,39 +91,44 @@
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("Latitude: %s\n\r",token);
+                        //pc.printf("Latitude: %s\n\r",token);
+                        memcpy(gpsfix_latitude, token, sizeof gpsfix_latitude - 1);
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("North/South: %s\n\r",token);
+                        //pc.printf("North/South: %s\n\r",token);
+                        gpsfix_ns = *token;
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
                         pc.printf("Longitude: %s\n\r",token);
+                        memcpy(gpsfix_longtitude, token, sizeof gpsfix_longtitude - 1);
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
                         pc.printf("East/West: %s\n\r",token);
+                        gpsfix_ew = *token;
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("Speed in knots: %s\n\r",token);
+                        //pc.printf("Speed in knots: %s\n\r",token);
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("True course: %s\n\r",token);
+                        //pc.printf("True course: %s\n\r",token);
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("Date: %s\n\r",token);
+                        //pc.printf("Date: %s\n\r",token);
+                        memcpy(gpsfix_last_utc_date, token, sizeof gpsfix_last_utc_date - 1);
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("Variation: %s\n\r",token);
+                        //pc.printf("Variation: %s\n\r",token);
                     }
                     if (token != NULL) {
                         token = strtok(NULL, ",");
-                        pc.printf("East/West: %s\n\r",token);
+                        //pc.printf("Variation East/West: %s\n\r",token);
                     }
                 }