Changeset 3511 in ntrip


Ignore:
Timestamp:
Nov 25, 2011, 12:16:34 PM (10 years ago)
Author:
stoecker
Message:

update to final standard

Location:
trunk/clock_and_orbit/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/clock_and_orbit/lib/clock_orbit_rtcm.c

    r3495 r3511  
    9494/* standard values */
    9595#define T_MESSAGE_NUMBER(a)              ADDBITS(12, a) /* DF002 */
    96 #define T_RESERVED4                      ADDBITS(4, 0)  /* DF001 */
    97 #define T_RESERVED5                      ADDBITS(5, 0)  /* DF001 */
    9896#define T_GPS_SATELLITE_ID(a)            ADDBITS(6, a)  /* DF068 */
    9997#define T_GPS_IODE(a)                    ADDBITS(8, a)  /* DF071 */
     
    125123#define T_HR_CLOCK_CORRECTION(a)         SCALEADDBITS(22,    10000.0, a)
    126124#define T_SSR_UPDATE_INTERVAL(a)         ADDBITS(4, a)
     125
     126#define T_SSR_IOD(a)                     ADDBITS(4, a)
     127#define T_SSR_PROVIDER_ID(a)             ADDBITS(16, a)
     128#define T_SSR_SOLUTION_ID(a)             ADDBITS(4, a)
    127129
    128130static double URAToValue(int ura)
     
    206208    --mmi;
    207209    T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    208     T_RESERVED4
     210    T_SSR_IOD(co->SSRIOD)
     211    T_SSR_PROVIDER_ID(co->SSRProviderID)
     212    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    209213    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
    210214    for(i = 0; i < co->NumberOfGPSSat; ++i)
     
    229233    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    230234    --mmi;
    231     T_RESERVED5
     235    T_SSR_IOD(co->SSRIOD)
     236    T_SSR_PROVIDER_ID(co->SSRProviderID)
     237    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    232238    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
    233239    for(i = 0; i < co->NumberOfGPSSat; ++i)
     
    268274      --mmi;
    269275      T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    270       T_RESERVED4
     276      T_SSR_IOD(co->SSRIOD)
     277      T_SSR_PROVIDER_ID(co->SSRProviderID)
     278      T_SSR_SOLUTION_ID(co->SSRSolutionID)
    271279#ifdef SPLITBLOCK
    272280      T_NO_OF_SATELLITES(nums)
     
    305313    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    306314    --mmi;
    307     T_RESERVED5
     315    T_SSR_IOD(co->SSRIOD)
     316    T_SSR_PROVIDER_ID(co->SSRProviderID)
     317    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    308318    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
    309319    for(i = 0; i < co->NumberOfGPSSat; ++i)
     
    321331    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    322332    --mmi;
    323     T_RESERVED5
     333    T_SSR_IOD(co->SSRIOD)
     334    T_SSR_PROVIDER_ID(co->SSRProviderID)
     335    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    324336    T_NO_OF_SATELLITES(co->NumberOfGPSSat)
    325337    for(i = 0; i < co->NumberOfGPSSat; ++i)
     
    339351    --mmi;
    340352    T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    341     T_RESERVED4
     353    T_SSR_IOD(co->SSRIOD)
     354    T_SSR_PROVIDER_ID(co->SSRProviderID)
     355    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    342356    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    343357    for(i = CLOCKORBIT_NUMGPS;
     
    363377    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    364378    --mmi;
    365     T_RESERVED5
     379    T_SSR_IOD(co->SSRIOD)
     380    T_SSR_PROVIDER_ID(co->SSRProviderID)
     381    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    366382    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    367383    for(i = CLOCKORBIT_NUMGPS;
     
    385401    --mmi;
    386402    T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    387     T_RESERVED4
     403    T_SSR_IOD(co->SSRIOD)
     404    T_SSR_PROVIDER_ID(co->SSRProviderID)
     405    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    388406    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    389407    for(i = CLOCKORBIT_NUMGPS;
     
    412430    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    413431    --mmi;
    414     T_RESERVED5
     432    T_SSR_IOD(co->SSRIOD)
     433    T_SSR_PROVIDER_ID(co->SSRProviderID)
     434    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    415435    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    416436    for(i = CLOCKORBIT_NUMGPS;
     
    429449    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    430450    --mmi;
    431     T_RESERVED5
     451    T_SSR_IOD(co->SSRIOD)
     452    T_SSR_PROVIDER_ID(co->SSRProviderID)
     453    T_SSR_SOLUTION_ID(co->SSRSolutionID)
    432454    T_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    433455    for(i = CLOCKORBIT_NUMGPS;
     
    466488    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    467489    --mmi;
    468     T_RESERVED5
     490    T_SSR_IOD(b->SSRIOD)
     491    T_SSR_PROVIDER_ID(b->SSRProviderID)
     492    T_SSR_SOLUTION_ID(b->SSRSolutionID)
    469493    T_NO_OF_SATELLITES(b->NumberOfGPSSat)
    470494    for(i = 0; i < b->NumberOfGPSSat; ++i)
     
    488512    T_MULTIPLE_MESSAGE_INDICATOR(/*mmi ? 1 :*/0)
    489513    --mmi;
    490     T_RESERVED5
     514    T_SSR_IOD(b->SSRIOD)
     515    T_SSR_PROVIDER_ID(b->SSRProviderID)
     516    T_SSR_SOLUTION_ID(b->SSRSolutionID)
    491517    T_NO_OF_SATELLITES(b->NumberOfGLONASSSat)
    492518    for(i = CLOCKORBIT_NUMGPS;
     
    550576#define G_SIZE(a)                        GETBITS(a, 10)
    551577#define G_MESSAGE_NUMBER(a)              GETBITS(a, 12) /* DF002 */
    552 #define G_RESERVED4                      SKIPBITS(4)    /* DF001 */
    553 #define G_RESERVED5                      SKIPBITS(5)    /* DF001 */
    554578#define G_GPS_SATELLITE_ID(a)            GETBITS(a, 6)  /* DF068 */
    555579#define G_GPS_IODE(a)                    GETBITS(a, 8)  /* DF071 */
     
    585609#define G_SSR_UPDATE_INTERVAL(a)         GETBITS(a, 4)
    586610
     611#define G_SSR_IOD(a)                     GETBITS(a, 4)
     612#define G_SSR_PROVIDER_ID(a)             GETBITS(a, 16)
     613#define G_SSR_SOLUTION_ID(a)             GETBITS(a, 4)
     614
    587615enum GCOB_RETURN GetClockOrbitBias(struct ClockOrbit *co, struct Bias *b,
    588616const char *buffer, size_t size, int *bytesused)
     
    630658    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    631659    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    632     G_RESERVED4
     660    G_SSR_IOD(co->SSRIOD)
     661    G_SSR_PROVIDER_ID(co->SSRProviderID)
     662    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    633663    G_NO_OF_SATELLITES(nums)
    634664    co->OrbitDataSupplied |= 1;
     
    671701    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
    672702    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    673     G_RESERVED5
     703    G_SSR_IOD(co->SSRIOD)
     704    G_SSR_PROVIDER_ID(co->SSRProviderID)
     705    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    674706    G_NO_OF_SATELLITES(nums)
    675707    co->ClockDataSupplied |= 1;
     
    706738    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    707739    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    708     G_RESERVED4
     740    G_SSR_IOD(co->SSRIOD)
     741    G_SSR_PROVIDER_ID(co->SSRProviderID)
     742    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    709743    G_NO_OF_SATELLITES(nums)
    710744    co->OrbitDataSupplied |= 1;
     
    738772    if(co->epochSize < 100) {co->epochSize += 1;}     /* Weber, for latency */
    739773    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    740     G_RESERVED5
     774    G_SSR_IOD(co->SSRIOD)
     775    G_SSR_PROVIDER_ID(co->SSRProviderID)
     776    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    741777    G_NO_OF_SATELLITES(nums)
    742778    co->URADataSupplied |= 1;
     
    761797    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
    762798    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    763     G_RESERVED5
     799    G_SSR_IOD(co->SSRIOD)
     800    G_SSR_PROVIDER_ID(co->SSRProviderID)
     801    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    764802    G_NO_OF_SATELLITES(nums)
    765803    co->HRDataSupplied |= 1;
     
    783821    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    784822    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    785     G_RESERVED4
     823    G_SSR_IOD(co->SSRIOD)
     824    G_SSR_PROVIDER_ID(co->SSRProviderID)
     825    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    786826    G_NO_OF_SATELLITES(nums)
    787827    co->OrbitDataSupplied |= 2;
     
    822862    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
    823863    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    824     G_RESERVED5
     864    G_SSR_IOD(co->SSRIOD)
     865    G_SSR_PROVIDER_ID(co->SSRProviderID)
     866    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    825867    G_NO_OF_SATELLITES(nums)
    826868    co->ClockDataSupplied |= 2;
     
    855897    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    856898    G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
    857     G_RESERVED4
     899    G_SSR_IOD(co->SSRIOD)
     900    G_SSR_PROVIDER_ID(co->SSRProviderID)
     901    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    858902    G_NO_OF_SATELLITES(nums)
    859903    co->OrbitDataSupplied |= 2;
     
    885929    G_GLONASS_EPOCH_TIME(co->GLONASSEpochTime, co->NumberOfGLONASSSat)
    886930    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    887     G_RESERVED5
     931    G_SSR_IOD(co->SSRIOD)
     932    G_SSR_PROVIDER_ID(co->SSRProviderID)
     933    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    888934    G_NO_OF_SATELLITES(nums)
    889935    co->URADataSupplied |= 2;
     
    906952    G_SSR_UPDATE_INTERVAL(co->UpdateInterval)
    907953    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    908     G_RESERVED5
     954    G_SSR_IOD(co->SSRIOD)
     955    G_SSR_PROVIDER_ID(co->SSRProviderID)
     956    G_SSR_SOLUTION_ID(co->SSRSolutionID)
    909957    G_NO_OF_SATELLITES(nums)
    910958    co->HRDataSupplied |= 2;
     
    927975    G_SSR_UPDATE_INTERVAL(b->UpdateInterval)
    928976    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    929     G_RESERVED5
     977    G_SSR_IOD(b->SSRIOD)
     978    G_SSR_PROVIDER_ID(b->SSRProviderID)
     979    G_SSR_SOLUTION_ID(b->SSRSolutionID)
    930980    G_NO_OF_SATELLITES(nums)
    931981    for(i = 0; i < nums; ++i)
     
    9521002    G_SSR_UPDATE_INTERVAL(b->UpdateInterval)
    9531003    G_MULTIPLE_MESSAGE_INDICATOR(mmi)
    954     G_RESERVED5
     1004    G_SSR_IOD(b->SSRIOD)
     1005    G_SSR_PROVIDER_ID(b->SSRProviderID)
     1006    G_SSR_SOLUTION_ID(b->SSRSolutionID)
    9551007    G_NO_OF_SATELLITES(nums)
    9561008    for(i = 0; i < nums; ++i)
  • trunk/clock_and_orbit/lib/clock_orbit_rtcm.h

    r3495 r3511  
    7272  int epochGPS[101];                /* Weber, for latency */
    7373  int epochSize;                    /* Weber, for latency */
     74  int SSRIOD;
     75  int SSRProviderID;
     76  int SSRSolutionID;
    7477  int UpdateInterval;
    7578  enum SatelliteReferenceDatum SatRefDatum;
     
    105108  int NumberOfGLONASSSat;           /* 0 .. 24 */
    106109  int UpdateInterval;
     110  int SSRIOD;
     111  int SSRProviderID;
     112  int SSRSolutionID;
    107113  struct BiasSat
    108114  {
Note: See TracChangeset for help on using the changeset viewer.