Changeset 2422 in ntrip

Timestamp:

Apr 14, 2010, 1:37:02 PM (15 years ago)

Author:

stoecker

Message:

added cross-correlation patch by Edgar Johansen

Location:

trunk/rtcm3torinex

Files:

• rtcm3torinex.c (modified) (5 diffs)
• rtcm3torinex.h (modified) (2 diffs)

trunk/rtcm3torinex/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.38 2010/03/01 13:48:25 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.39 2010/03/05 11:11:06 stoecker Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -55 +55 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.38 $";
+static char revisionstr[] = "$Revision: 1.39 $";
 
 #ifndef COMPILEDATE
@@ -560 +560 @@
               l = GNSSDF_L2PDATA; le = GNSSENTRY_L2PDATA;
               s = GNSSDF_S2PDATA; se = GNSSENTRY_S2PDATA;
+              if(code >= 2)
+                gnss->dataflags[num] |= GNSSDF_XCORRL2;
             }
             else
@@ -1666 +1668 @@
                 if(df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA))
                 {
-                  if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
-                    lli = '1';
+                  if(Parser->Data.dataflags[i] & (GNSSDF_LOCKLOSSL2|GNSSDF_XCORRL2))
+                  {
+                    lli = '0';
+                    if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
+                      lli += 1;
+                    if(Parser->Data.dataflags[i] & GNSSDF_XCORRL2)
+                      lli += 4;
+                  }
                   snr = '0'+Parser->Data.snrL2[i];
                 }
+                if((df & GNSSDF_P2DATA) && (Parser->Data.dataflags[i] & GNSSDF_XCORRL2))
+                  lli = '4';
                 RTCM3Text("%14.3f%c%c",
                 Parser->Data.measdata[i][pos],lli,snr);
@@ -1684 +1694 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2010/03/01 13:48:25 $";
+static char datestr[]     = "$Date: 2010/03/05 11:11:06 $";
 
 /* The string, which is send as agent in HTTP request */

trunk/rtcm3torinex/rtcm3torinex.h

@@ -4 +4 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.11 2010/03/01 13:48:25 stoecker Exp $
+  $Id: rtcm3torinex.h,v 1.12 2010/03/05 11:11:06 stoecker Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -99 +99 @@
 
 /* Additional flags for the data field, which tell us more. */
+#define GNSSDF_XCORRL2        (1<<28)  /* cross-correlated L2 */
 #define GNSSDF_LOCKLOSSL1     (1<<29)  /* lost lock on L1 */
 #define GNSSDF_LOCKLOSSL2     (1<<30)  /* lost lock on L2 */