Changeset 8967 in ntrip for trunk/BNC/src/RTCM3


Ignore:
Timestamp:
Jul 2, 2020, 1:56:59 PM (4 years ago)
Author:
stuerze
Message:

minor changes in rtcm ssr to be compatible with future igs ssr

Location:
trunk/BNC/src/RTCM3/clock_and_orbit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c

    r8963 r8967  
    551551
    552552  for (s = 0; s < CLOCKORBIT_SATNUM; ++s) {
    553     if (b->NumberOfSat[s] && (type == BTYPE_AUTO || type == corbase[s] + COBOFS_BIAS)) {
     553    if (b->NumberOfSat[s] && (type == CBTYPE_AUTO || type == corbase[s] + COBOFS_CBIAS)) {
    554554      INITBLOCK
    555       T_MESSAGE_NUMBER(corbase[s] + COBOFS_BIAS)
     555      T_MESSAGE_NUMBER(corbase[s] + COBOFS_CBIAS)
    556556      switch (s) {
    557557        case CLOCKORBIT_SATGPS:
     
    12891289          }
    12901290          break;
    1291         case COBOFS_BIAS:
     1291        case COBOFS_CBIAS:
    12921292          if (!b)
    12931293            return GCOBR_NOCODEBIASPARAMETER;
  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

    r8966 r8967  
    1313#include <string.h>
    1414
    15 enum SatelliteReferenceDatum { DATUM_ITRF=0, DATUM_LOCAL=1 };
     15enum SatelliteReferenceDatum {
     16  DATUM_ITRF  = 0,
     17  DATUM_LOCAL = 1
     18};
    1619
    1720enum COR_BASE {
     
    2730  COBOFS_ORBIT = 0,
    2831  COBOFS_CLOCK,
    29   COBOFS_BIAS,
     32  COBOFS_CBIAS,
    3033  COBOFS_COMBINED,
    3134  COBOFS_URA,
     
    3538
    3639enum ClockOrbitType {
    37   COTYPE_GPSORBIT    = COBBASE_GPS + COBOFS_ORBIT,
     40  COTYPE_GPSORBIT        = COBBASE_GPS + COBOFS_ORBIT,
    3841  COTYPE_GPSCLOCK,
    39   COTYPE_GPSCOMBINED = COBBASE_GPS + COBOFS_COMBINED,
     42  COTYPE_GPSCOMBINED     = COBBASE_GPS + COBOFS_COMBINED,
    4043  COTYPE_GPSURA,
    4144  COTYPE_GPSHR,
     
    5356  COTYPE_GALILEOHR,
    5457
    55   COTYPE_QZSSORBIT    = COBBASE_QZSS + COBOFS_ORBIT,
     58  COTYPE_QZSSORBIT       = COBBASE_QZSS + COBOFS_ORBIT,
    5659  COTYPE_QZSSCLOCK,
    57   COTYPE_QZSSCOMBINED = COBBASE_QZSS + COBOFS_COMBINED,
     60  COTYPE_QZSSCOMBINED    = COBBASE_QZSS + COBOFS_COMBINED,
    5861  COTYPE_QZSSURA,
    5962  COTYPE_QZSSHR,
    6063
    61   COTYPE_SBASORBIT    = COBBASE_SBAS + COBOFS_ORBIT,
     64  COTYPE_SBASORBIT       = COBBASE_SBAS + COBOFS_ORBIT,
    6265  COTYPE_SBASCLOCK,
    63   COTYPE_SBASCOMBINED = COBBASE_SBAS + COBOFS_COMBINED,
     66  COTYPE_SBASCOMBINED    = COBBASE_SBAS + COBOFS_COMBINED,
    6467  COTYPE_SBASURA,
    6568  COTYPE_SBASHR,
    6669
    67   COTYPE_BDSORBIT    = COBBASE_BDS + COBOFS_ORBIT,
     70  COTYPE_BDSORBIT        = COBBASE_BDS + COBOFS_ORBIT,
    6871  COTYPE_BDSCLOCK,
    69   COTYPE_BDSCOMBINED = COBBASE_BDS + COBOFS_COMBINED,
     72  COTYPE_BDSCOMBINED     = COBBASE_BDS + COBOFS_COMBINED,
    7073  COTYPE_BDSURA,
    7174  COTYPE_BDSHR,
     
    7578
    7679enum CodeBiasType {
    77   BTYPE_GPS     = COBBASE_GPS     + COBOFS_BIAS,
    78   BTYPE_GLONASS = COBBASE_GLONASS + COBOFS_BIAS,
    79   BTYPE_GALILEO = COBBASE_GALILEO + COBOFS_BIAS,
    80   BTYPE_QZSS    = COBBASE_QZSS    + COBOFS_BIAS,
    81   BTYPE_SBAS    = COBBASE_SBAS    + COBOFS_BIAS,
    82   BTYPE_BDS     = COBBASE_BDS     + COBOFS_BIAS,
    83   BTYPE_AUTO = 0
     80  CBTYPE_GPS     = COBBASE_GPS     + COBOFS_CBIAS,
     81  CBTYPE_GLONASS = COBBASE_GLONASS + COBOFS_CBIAS,
     82  CBTYPE_GALILEO = COBBASE_GALILEO + COBOFS_CBIAS,
     83  CBTYPE_QZSS    = COBBASE_QZSS    + COBOFS_CBIAS,
     84  CBTYPE_SBAS    = COBBASE_SBAS    + COBOFS_CBIAS,
     85  CBTYPE_BDS     = COBBASE_BDS     + COBOFS_CBIAS,
     86  CBTYPE_AUTO = 0
    8487};
    8588
    8689enum PhaseBiasType {
    87   PBTYPE_BASE = 1265,
    88   PBTYPE_GPS = PBTYPE_BASE,
     90  PBTYPE_BASE    = 1265,
     91  PBTYPE_GPS     = PBTYPE_BASE,
    8992  PBTYPE_GLONASS,
    9093  PBTYPE_GALILEO,
     
    102105for these systems to save space */
    103106enum COR_CONSTANTS {
    104   CLOCKORBIT_BUFFERSIZE=8192,
    105   CLOCKORBIT_NUMGPS=32,
    106   CLOCKORBIT_NUMGLONASS=26,
    107   CLOCKORBIT_NUMGALILEO=36,
    108   CLOCKORBIT_NUMQZSS=10,
    109   CLOCKORBIT_NUMSBAS=38,
    110   CLOCKORBIT_NUMBDS=65,
    111   CLOCKORBIT_NUMBIAS=100,
    112   CLOCKORBIT_NUMIONOLAYERS=4,
    113   CLOCKORBIT_MAXIONOORDER=16,
    114   CLOCKORBIT_MAXIONODEGREE=16
     107  CLOCKORBIT_BUFFERSIZE    = 8192,
     108  CLOCKORBIT_NUMGPS        =   32,
     109  CLOCKORBIT_NUMGLONASS    =   26,
     110  CLOCKORBIT_NUMGALILEO    =   36,
     111  CLOCKORBIT_NUMQZSS       =   10,
     112  CLOCKORBIT_NUMBDS        =   65,
     113  CLOCKORBIT_NUMSBAS       =   38,
     114  CLOCKORBIT_NUMBIAS       =  100,
     115  CLOCKORBIT_NUMIONOLAYERS =    4,
     116  CLOCKORBIT_MAXIONOORDER  =   16,
     117  CLOCKORBIT_MAXIONODEGREE =   16
    115118};
    116119
     
    120123  CLOCKORBIT_SATGALILEO,
    121124  CLOCKORBIT_SATQZSS,
     125  CLOCKORBIT_SATBDS,
    122126  CLOCKORBIT_SATSBAS,
    123   CLOCKORBIT_SATBDS,
    124127  CLOCKORBIT_SATNUM
    125128};
     
    128131  CLOCKORBIT_OFFSETGPS     = 0,
    129132  CLOCKORBIT_OFFSETGLONASS = CLOCKORBIT_NUMGPS,
    130   CLOCKORBIT_OFFSETGALILEO = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS,
    131   CLOCKORBIT_OFFSETQZSS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO,
    132   CLOCKORBIT_OFFSETSBAS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
     133  CLOCKORBIT_OFFSETGALILEO = CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS,
     134  CLOCKORBIT_OFFSETQZSS    = CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO,
     135  CLOCKORBIT_OFFSETBDS     = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
    133136                           + CLOCKORBIT_NUMQZSS,
    134   CLOCKORBIT_OFFSETBDS     = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
    135                            + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS,
    136   CLOCKORBIT_COUNTSAT      = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
    137                            + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS + CLOCKORBIT_NUMBDS
     137  CLOCKORBIT_OFFSETSBAS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
     138                           + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMBDS,
     139  CLOCKORBIT_COUNTSAT      = CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO
     140                           + CLOCKORBIT_NUMSBAS + CLOCKORBIT_NUMQZSS    + CLOCKORBIT_NUMBDS
    138141};
    139142
Note: See TracChangeset for help on using the changeset viewer.