Changeset 2490 in ntrip for trunk

Timestamp:

Jun 1, 2010, 7:45:56 PM (14 years ago)

Author:

stoecker

Message:

fix loss of lock (patch by Edgar Johansen)

Location:

trunk/rtcm3torinex

Files:

• rtcm3torinex.c (modified) (6 diffs)
• rtcm3torinex.h (modified) (1 diff)

trunk/rtcm3torinex/rtcm3torinex.c

@@ -528 +528 @@
           GETBITS(i, 7);
           lastlockl1[sv] = i;
-          if(handle->lastlockl1[sv] > i)
+          if(handle->lastlockGPSl1[sv] > i)
             gnss->dataflags[num] |= GNSSDF_LOCKLOSSL1;
           if(type == 1002 || type == 1004)
@@ -585 +585 @@
             GETBITS(i,7);
             lastlockl2[sv] = i;
-            if(handle->lastlockl2[sv] > i)
+            if(handle->lastlockGPSl2[sv] > i)
               gnss->dataflags[num] |= GNSSDF_LOCKLOSSL2;
             if(type == 1004)
@@ -605 +605 @@
         for(i = 0; i < 64; ++i)
         {
-          handle->lastlockl1[i] = lastlockl1[i];
-          handle->lastlockl2[i] = lastlockl2[i];
+          handle->lastlockGPSl1[i] = lastlockl1[i];
+          handle->lastlockGPSl2[i] = lastlockl2[i];
         }
         if(!syncf && !old)
@@ -706 +706 @@
           GETBITS(i, 7)
           lastlockl1[sv] = i;
-          if(handle->lastlockl1[sv] > i)
+          if(handle->lastlockGLOl1[sv] > i)
             gnss->dataflags[num] |= GNSSDF_LOCKLOSSL1;
           if(type == 1010 || type == 1012)
@@ -761 +761 @@
             GETBITS(i,7)
             lastlockl2[sv] = i;
-            if(handle->lastlockl2[sv] > i)
+            if(handle->lastlockGLOl2[sv] > i)
               gnss->dataflags[num] |= GNSSDF_LOCKLOSSL2;
             if(type == 1012)
@@ -783 +783 @@
         for(i = 0; i < 64; ++i)
         {
-          handle->lastlockl1[i] = lastlockl1[i];
-          handle->lastlockl2[i] = lastlockl2[i];
+          handle->lastlockGLOl1[i] = lastlockl1[i];
+          handle->lastlockGLOl2[i] = lastlockl2[i];
         }
         if(!syncf && !old)

trunk/rtcm3torinex/rtcm3torinex.h

@@ -209 +209 @@
   struct gnssdata DataNew;
   int    size;
-  int    lastlockl1[64];
-  int    lastlockl2[64];
+  int    lastlockGPSl1[64];
+  int    lastlockGPSl2[64];
+  int    lastlockGLOl1[64];
+  int    lastlockGLOl2[64];
 #ifdef NO_RTCM3_MAIN
   double antX;