Changeset 2354 in ntrip for trunk/BNS


Ignore:
Timestamp:
Mar 5, 2010, 12:54:05 PM (12 years ago)
Author:
weber
Message:

* empty log message *

Location:
trunk/BNS/RTCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNS/RTCM/rtcm3torinex.c

    r2261 r2354  
    11/*
    22  Converter for RTCM3 data to RINEX.
    3   $Id: rtcm3torinex.c,v 1.4 2010/01/16 10:22:15 mervart 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
     
    4949
    5050#ifndef isinf
    51 #  define isinf(x) 0
     51#define isinf(x) 0
    5252#endif
    5353
     
    5555
    5656/* CVS revision and version */
    57 static char revisionstr[] = "$Revision: 1.4 $";
     57static char revisionstr[] = "$Revision: 1.39 $";
    5858
    5959#ifndef COMPILEDATE
     
    251251}
    252252
    253 // Convert Moscow time into UTC (fixnumleap == 1) or GPS (fixnumleap == 0)
     253/* Convert Moscow time into UTC (fixnumleap == 1) or GPS (fixnumleap == 0) */
    254254void updatetime(int *week, int *secOfWeek, int mSecOfWeek, int fixnumleap)
    255255{
     
    490490        SKIPBITS(4) /* smind, smint */
    491491
    492         while(numsats--)
     492        while(numsats-- && gnss->numsats < GNSS_MAXSATS)
    493493        {
    494494          int sv, code, l1range, c,l,s,ce,le,se,amb=0;
     
    640640        GETBITS(i,27) /* tk */
    641641
    642         updatetime(&handle->GPSWeek, &handle->GPSTOW, i, 0); // Moscow -> GPS
     642        updatetime(&handle->GPSWeek, &handle->GPSTOW, i, 0); /* Moscow -> GPS */
    643643        i = handle->GPSTOW*1000;
    644644        if(gnss->week && (gnss->timeofweek != i || gnss->week
     
    658658        SKIPBITS(4) /* smind, smint */
    659659
    660         while(numsats--)
     660        while(numsats-- && gnss->numsats < GNSS_MAXSATS)
    661661        {
    662662          int sv, code, l1range, c,l,s,ce,le,se,amb=0;
     
    13971397            struct converttimeinfo cti;
    13981398
    1399             updatetime(&w, &tow, e->tb*1000, 1);  // Moscow - > UTC
     1399            updatetime(&w, &tow, e->tb*1000, 1);  /* Moscow - > UTC */
    14001400            converttime(&cti, w, tow);
    14011401
     
    16841684
    16851685#ifndef NO_RTCM3_MAIN
    1686 static char datestr[]     = "$Date: 2010/01/16 10:22:15 $";
     1686static char datestr[]     = "$Date: 2010/03/05 11:11:06 $";
    16871687
    16881688/* The string, which is send as agent in HTTP request */
  • trunk/BNS/RTCM/rtcm3torinex.h

    r2236 r2354  
    44/*
    55  Converter for RTCM3 data to RINEX.
    6   $Id: rtcm3torinex.h,v 1.19 2010/01/12 12:13:23 mervart 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
     
    2424
    2525#include <stdio.h>
     26
     27#define GNSS_MAXSATS 64
    2628
    2729#define PRN_GPS_START             1
     
    114116  int    numsats;
    115117  double timeofweek;         /* milliseconds in GPS week */
    116   double measdata[24][GNSSENTRY_NUMBER];  /* data fields */
    117   int    dataflags[24];      /* GPSDF_xxx */
    118   int    satellites[24];     /* SV - IDs */
    119   int    channels[24];       /* Glonass channels - valid of Glonass SV only */
    120   int    snrL1[24];          /* Important: all the 5 SV-specific fields must */
    121   int    snrL2[24];          /* have the same SV-order */
     118  double measdata[GNSS_MAXSATS][GNSSENTRY_NUMBER];  /* data fields */
     119  int    dataflags[GNSS_MAXSATS];      /* GPSDF_xxx */
     120  int    satellites[GNSS_MAXSATS];     /* SV - IDs */
     121  int    channels[GNSS_MAXSATS];       /* Glonass channels - valid of Glonass SV only */
     122  int    snrL1[GNSS_MAXSATS];          /* Important: all the 5 SV-specific fields must */
     123  int    snrL2[GNSS_MAXSATS];          /* have the same SV-order */
    122124};
    123125
Note: See TracChangeset for help on using the changeset viewer.