Diff: SPS/SPS.cpp

Revision:

25:57f9e3273979

Parent:

24:099df3fa2b13

Child:

26:68277a308839

--- a/SPS/SPS.cpp	Wed May 31 07:02:02 2017 +0000
+++ b/SPS/SPS.cpp	Fri Jun 02 10:43:14 2017 +0000
@@ -63,8 +63,13 @@
     addToCurrentString(date);
     addToCurrentString(SPACE);
     addToCurrentString(time);
-    addToCurrentString(SPACE); 
-    addToCurrentString("ZZZ");
+    addToCurrentString(SPACE);
+    if(!gpsFixFlag){
+        addToCurrentString("NOC");    
+    }
+    if(gpsFixFlag){
+        addToCurrentString("ZZZ");    
+    }  
     addToCurrentString(SPACE);
     addToCurrentString(HEADEREND);
     addToCurrentString(SPACE);
@@ -91,10 +96,10 @@
         addToCurrentString("NaN");    
     }  
     addToCurrentString(SPACE);
-    if(gpsFixFlag){
+    if(gpsFixFlag && (strlen(longitude.c_str()) > 5)){
         addToCurrentString(longitude);    
     }
-    if(!gpsFixFlag){
+    if(!gpsFixFlag || (strlen(longitude.c_str()) < 5)){
         addToCurrentString("NaN");    
     } 
     addToCurrentString(SPACE); 
@@ -253,15 +258,16 @@
     addToCurrentErrString(date);
     addToCurrentErrString(SPACE);
     addToCurrentErrString(time);
-    addToCurrentErrString(SPACE); 
-    addToCurrentErrString("NOC");
+    addToCurrentErrString(SPACE);
+    addToCurrentErrString("ZZZ");
     addToCurrentErrString(SPACE);
     addToCurrentErrString(HEADEREND);
+    addToCurrentErrString(SPACE);
     addToCurrentErrString(source_id);
     addToCurrentErrString(SPACE);
     addToCurrentErrString(interpreter_id);
     addToCurrentErrString(SPACE);
-    addToCurrentErrString("01");
+    addToCurrentErrString("02");
     addToCurrentErrString(SPACE);
     addToCurrentErrString(encoding);
     addToCurrentErrString(SPACE);
@@ -272,6 +278,10 @@
     addToCurrentErrString(HEADEREND);
     addToCurrentErrString(SPACE);
     addToCurrentErrString("BMAG");
+    if(!gpsFixFlag){
+        addToCurrentErrString(SPACE);
+        addToCurrentErrString("RTC");
+    }
     addToCurrentErrString(SPACE);
     addToCurrentErrString("C02");
     addToCurrentErrString(SPACE);