Changeset 2422 in ntrip


Ignore:
Timestamp:
Apr 14, 2010, 1:37:02 PM (8 years ago)
Author:
stoecker
Message:

added cross-correlation patch by Edgar Johansen

Location:
trunk/rtcm3torinex
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/rtcm3torinex/rtcm3torinex.c

    r2352 r2422  
    11/*
    22  Converter for RTCM3 data to RINEX.
    3   $Id: rtcm3torinex.c,v 1.38 2010/03/01 13:48:25 stoecker Exp $
     3  $Id: rtcm3torinex.c,v 1.39 2010/03/05 11:11:06 stoecker Exp $
    44  Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
    55
     
    5555
    5656/* CVS revision and version */
    57 static char revisionstr[] = "$Revision: 1.38 $";
     57static char revisionstr[] = "$Revision: 1.39 $";
    5858
    5959#ifndef COMPILEDATE
     
    560560              l = GNSSDF_L2PDATA; le = GNSSENTRY_L2PDATA;
    561561              s = GNSSDF_S2PDATA; se = GNSSENTRY_S2PDATA;
     562              if(code >= 2)
     563                gnss->dataflags[num] |= GNSSDF_XCORRL2;
    562564            }
    563565            else
     
    16661668                if(df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA))
    16671669                {
    1668                   if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
    1669                     lli = '1';
     1670                  if(Parser->Data.dataflags[i] & (GNSSDF_LOCKLOSSL2|GNSSDF_XCORRL2))
     1671                  {
     1672                    lli = '0';
     1673                    if(Parser->Data.dataflags[i] & GNSSDF_LOCKLOSSL2)
     1674                      lli += 1;
     1675                    if(Parser->Data.dataflags[i] & GNSSDF_XCORRL2)
     1676                      lli += 4;
     1677                  }
    16701678                  snr = '0'+Parser->Data.snrL2[i];
    16711679                }
     1680                if((df & GNSSDF_P2DATA) && (Parser->Data.dataflags[i] & GNSSDF_XCORRL2))
     1681                  lli = '4';
    16721682                RTCM3Text("%14.3f%c%c",
    16731683                Parser->Data.measdata[i][pos],lli,snr);
     
    16841694
    16851695#ifndef NO_RTCM3_MAIN
    1686 static char datestr[]     = "$Date: 2010/03/01 13:48:25 $";
     1696static char datestr[]     = "$Date: 2010/03/05 11:11:06 $";
    16871697
    16881698/* The string, which is send as agent in HTTP request */
  • trunk/rtcm3torinex/rtcm3torinex.h

    r2352 r2422  
    44/*
    55  Converter for RTCM3 data to RINEX.
    6   $Id: rtcm3torinex.h,v 1.11 2010/03/01 13:48:25 stoecker Exp $
     6  $Id: rtcm3torinex.h,v 1.12 2010/03/05 11:11:06 stoecker Exp $
    77  Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
    88
     
    9999
    100100/* Additional flags for the data field, which tell us more. */
     101#define GNSSDF_XCORRL2        (1<<28)  /* cross-correlated L2 */
    101102#define GNSSDF_LOCKLOSSL1     (1<<29)  /* lost lock on L1 */
    102103#define GNSSDF_LOCKLOSSL2     (1<<30)  /* lost lock on L2 */
Note: See TracChangeset for help on using the changeset viewer.