Changeset 10995 in ntrip


Ignore:
Timestamp:
Aug 26, 2026, 10:57:28 AM (4 weeks ago)
Author:
stuerze
Message:

minor changes

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

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

    r10994 r10995  
    5454  CLOCKORBIT_OFFSETGLONASS = CLOCKORBIT_NUMGPS,
    5555  CLOCKORBIT_OFFSETGALILEO = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS,
    56   CLOCKORBIT_OFFSETQZSS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
    57                            + CLOCKORBIT_NUMGALILEO,
    58   CLOCKORBIT_OFFSETSBAS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
    59                            + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS,
    60   CLOCKORBIT_OFFSETBDS     = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
    61                            + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
    62                            + CLOCKORBIT_NUMSBAS,
    63   CLOCKORBIT_COUNTSAT      = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
    64                            + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
    65                            + CLOCKORBIT_NUMSBAS + CLOCKORBIT_NUMBDS
     56  CLOCKORBIT_OFFSETQZSS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO,
     57  CLOCKORBIT_OFFSETSBAS    = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS,
     58  CLOCKORBIT_OFFSETBDS     = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS,
     59  CLOCKORBIT_COUNTSAT      = CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMSBAS + CLOCKORBIT_NUMBDS
    6660};
    6761
    … …  
    392386  struct PhaseBias {
    393387    PhaseBiasType messageType;
     388    PhaseBiasExtType messageExtType;
    394389    unsigned int EpochTime[CLOCKORBIT_SATNUM]; /* 0 .. system specific maximum */
    395390    unsigned int NumberOfSat[CLOCKORBIT_SATNUM]; /* 0 .. CLOCKORBIT_NUM... */

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h

    r10987 r10995  
    4949
    5050  void setCoType() {
    51     COTYPE_GPSORBIT        = COBBASE_GPS + COBOFS_ORBIT;
    52     COTYPE_GPSCLOCK        = COTYPE_GPSORBIT + 1;
    53     COTYPE_GPSCOMBINED     = COBBASE_GPS + COBOFS_COMBINED;
    54     COTYPE_GPSHR           = COTYPE_GPSCOMBINED + 1;
    55     COTYPE_GPSURA          = COBBASE_GPS + COBOFS_URA;
     51    COTYPE_GPSORBIT        = COBBASE_GPS     + COBOFS_ORBIT;
     52    COTYPE_GPSCLOCK        = COBBASE_GPS     + COBOFS_CLOCK;
     53    COTYPE_GPSCOMBINED     = COBBASE_GPS     + COBOFS_COMBINED;
     54    COTYPE_GPSHR           = COBBASE_GPS     + COBOFS_HR;
     55    COTYPE_GPSURA          = COBBASE_GPS     + COBOFS_URA;
    5656
    5757    COTYPE_GLONASSORBIT    = COBBASE_GLONASS + COBOFS_ORBIT;
    58     COTYPE_GLONASSCLOCK    = COTYPE_GLONASSORBIT + 1;
    59     COTYPE_GLONASSCOMBINED = COBBASE_GLONASS + COBOFS_COMBINED,
    60     COTYPE_GLONASSHR       = COTYPE_GLONASSCOMBINED + 1;
     58    COTYPE_GLONASSCLOCK    = COBBASE_GLONASS + COBOFS_CLOCK;
     59    COTYPE_GLONASSCOMBINED = COBBASE_GLONASS + COBOFS_COMBINED;
     60    COTYPE_GLONASSHR       = COBBASE_GLONASS + COBOFS_HR;
    6161    COTYPE_GLONASSURA      = COBBASE_GLONASS + COBOFS_URA,
    6262
    6363    COTYPE_GALILEOORBIT    = COBBASE_GALILEO + COBOFS_ORBIT;
    64     COTYPE_GALILEOCLOCK    = COTYPE_GALILEOORBIT + 1;
    65     COTYPE_GALILEOCOMBINED = COBBASE_GALILEO + COBOFS_COMBINED,
    66     COTYPE_GALILEOHR       = COTYPE_GALILEOCOMBINED + 1;
     64    COTYPE_GALILEOCLOCK    = COBBASE_GALILEO + COBOFS_CLOCK;
     65    COTYPE_GALILEOCOMBINED = COBBASE_GALILEO + COBOFS_COMBINED;
     66    COTYPE_GALILEOHR       = COBBASE_GALILEO + COBOFS_HR;
    6767    COTYPE_GALILEOURA      = COBBASE_GALILEO + COBOFS_URA;
    6868
    69     COTYPE_QZSSORBIT       = COBBASE_QZSS + COBOFS_ORBIT;
    70     COTYPE_QZSSCLOCK       = COTYPE_QZSSORBIT + 1;
    71     COTYPE_QZSSCOMBINED    = COBBASE_QZSS + COBOFS_COMBINED;
    72     COTYPE_QZSSHR          = COTYPE_QZSSCOMBINED + 1;
    73     COTYPE_QZSSURA         = COBBASE_QZSS + COBOFS_URA;
    74 
    75     COTYPE_SBASORBIT       = COBBASE_SBAS + COBOFS_ORBIT;
    76     COTYPE_SBASCLOCK       = COTYPE_SBASORBIT + 1;
    77     COTYPE_SBASCOMBINED    = COBBASE_SBAS + COBOFS_COMBINED;
    78     COTYPE_SBASHR          = COTYPE_SBASCOMBINED + 1;
    79     COTYPE_SBASURA         = COBBASE_SBAS + COBOFS_URA;
    80 
    81     COTYPE_BDSORBIT        = COBBASE_BDS + COBOFS_ORBIT;
    82     COTYPE_BDSCLOCK        = COTYPE_BDSORBIT + 1;
    83     COTYPE_BDSCOMBINED     = COBBASE_BDS + COBOFS_COMBINED;
    84     COTYPE_BDSHR           = COTYPE_BDSCOMBINED + 1;
    85     COTYPE_BDSURA          = COBBASE_BDS + COBOFS_URA;
     69    COTYPE_QZSSORBIT       = COBBASE_QZSS    + COBOFS_ORBIT;
     70    COTYPE_QZSSCLOCK       = COBBASE_QZSS    + COBOFS_CLOCK;
     71    COTYPE_QZSSCOMBINED    = COBBASE_QZSS    + COBOFS_COMBINED;
     72    COTYPE_QZSSHR          = COBBASE_QZSS    + COBOFS_HR;
     73    COTYPE_QZSSURA         = COBBASE_QZSS    + COBOFS_URA;
     74
     75    COTYPE_SBASORBIT       = COBBASE_SBAS    + COBOFS_ORBIT;
     76    COTYPE_SBASCLOCK       = COBBASE_SBAS    + COBOFS_CLOCK;
     77    COTYPE_SBASCOMBINED    = COBBASE_SBAS    + COBOFS_COMBINED;
     78    COTYPE_SBASHR          = COBBASE_SBAS    + COBOFS_HR;
     79    COTYPE_SBASURA         = COBBASE_SBAS    + COBOFS_URA;
     80
     81    COTYPE_BDSORBIT        = COBBASE_BDS     + COBOFS_ORBIT;
     82    COTYPE_BDSCLOCK        = COBBASE_BDS     + COBOFS_CLOCK;
     83    COTYPE_BDSCOMBINED     = COBBASE_BDS     + COBOFS_COMBINED;
     84    COTYPE_BDSHR           = COBBASE_BDS     + COBOFS_HR;
     85    COTYPE_BDSURA          = COBBASE_BDS     + COBOFS_URA;
    8686
    8787    COTYPE_AUTO = 0;

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp

    r10994 r10995  
    353353
    354354  for (s = 0; s < CLOCKORBIT_SATNUM; ++s) {
    355     /* The Widelane Signal Group Indicator shall be releated for every satellite and signal
     355    /* Extended Satellite Phase Bias Message
     356       The Widelane Signal Group Indicator shall be releated for every satellite and signal
    356357       included in the corresponding Satellite Phase Bias Message in the same order. The
    357        Extended Satellite Phase Bias Message shall be sent before the corresponding
     358       Extended Satellite Phase Bias Message shall be sent BEFORE the corresponding
    358359       Satellite Phase Bias Message */
    359360    if (b->NumberOfSat[s] && (type == PBEXTTYPE_AUTO || type == s + PBEXTTYPE_AUTO)) {
    … …  
    372373          break;
    373374      }
    374       E_SSR_UPDATE_INTERVAL(b->UpdateInterval)
    375375      E_SSR_IOD(b->SSRIOD)
    376376      E_SSR_PROVIDER_ID(b->SSRProviderID)
    … …  
    384384      ENDBLOCK
    385385    }
     386    /* Satellite Phase Bias Message */
    386387    if (b->NumberOfSat[s] && (type == PBTYPE_AUTO || type == s + PBTYPE_BASE)) {
    387388      INITBLOCK

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h

    r10994 r10995  
    3939  void setCoType() {
    4040    COTYPE_GPSORBIT        = COBBASE_GPS;
    41     COTYPE_GPSCLOCK        = COTYPE_GPSORBIT + 1;
    42     COTYPE_GPSCOMBINED     = COTYPE_GPSCLOCK + 2;
    43     COTYPE_GPSURA          = COTYPE_GPSCOMBINED + 1;
    44     COTYPE_GPSHR           = COTYPE_GPSURA + 1;
     41    COTYPE_GPSCLOCK        = COBBASE_GPS + 1;
     42    COTYPE_GPSCOMBINED     = COBBASE_GPS + 3;
     43    COTYPE_GPSURA          = COBBASE_GPS + 4;
     44    COTYPE_GPSHR           = COBBASE_GPS + 5;
    4545
    4646    COTYPE_GLONASSORBIT    = COBBASE_GLONASS;
    47     COTYPE_GLONASSCLOCK    = COTYPE_GLONASSORBIT + 1;
    48     COTYPE_GLONASSCOMBINED = COTYPE_GLONASSCLOCK + 2;
    49     COTYPE_GLONASSURA      = COTYPE_GLONASSCOMBINED + 1;
    50     COTYPE_GLONASSHR       = COTYPE_GLONASSURA + 1;
     47    COTYPE_GLONASSCLOCK    = COBBASE_GLONASS + 1;
     48    COTYPE_GLONASSCOMBINED = COBBASE_GLONASS + 3;
     49    COTYPE_GLONASSURA      = COBBASE_GLONASS + 4;
     50    COTYPE_GLONASSHR       = COBBASE_GLONASS + 5;
    5151
    5252    COTYPE_GALILEOORBIT    = COBBASE_GALILEO;
    53     COTYPE_GALILEOCLOCK    = COTYPE_GALILEOORBIT + 3;
    54     COTYPE_GALILEOCOMBINED = COTYPE_GALILEOCLOCK + 6;
    55     COTYPE_GALILEOURA      = COTYPE_GALILEOCOMBINED + 3;
    56     COTYPE_GALILEOHR       = COTYPE_GALILEOURA + 3;
     53    COTYPE_GALILEOCLOCK    = COBBASE_GALILEO + 3;
     54    COTYPE_GALILEOCOMBINED = COBBASE_GALILEO + 9;
     55    COTYPE_GALILEOURA      = COBBASE_GALILEO + 12;
     56    COTYPE_GALILEOHR       = COBBASE_GALILEO + 15;
    5757
    5858    COTYPE_BDSORBIT        = COBBASE_BDS;
    59     COTYPE_BDSCLOCK        = COTYPE_BDSORBIT + 3;
    60     COTYPE_BDSCOMBINED     = COTYPE_BDSCLOCK + 6;
    61     COTYPE_BDSURA          = COTYPE_BDSCOMBINED + 3;
    62     COTYPE_BDSHR           = COTYPE_BDSURA + 3;
     59    COTYPE_BDSCLOCK        = COBBASE_BDS + 3;
     60    COTYPE_BDSCOMBINED     = COBBASE_BDS + 9;
     61    COTYPE_BDSURA          = COBBASE_BDS + 12;
     62    COTYPE_BDSHR           = COBBASE_BDS + 15;
    6363
    6464    COTYPE_QZSSORBIT       = COBBASE_QZSS;
    65     COTYPE_QZSSCLOCK       = COTYPE_QZSSORBIT + 3;
    66     COTYPE_QZSSCOMBINED    = COTYPE_QZSSCLOCK + 6;
    67     COTYPE_QZSSURA         = COTYPE_QZSSCOMBINED + 3;
    68     COTYPE_QZSSHR          = COTYPE_QZSSURA + 3;
     65    COTYPE_QZSSCLOCK       = COBBASE_QZSS + 3;
     66    COTYPE_QZSSCOMBINED    = COBBASE_QZSS + 9;
     67    COTYPE_QZSSURA         = COBBASE_QZSS + 12;
     68    COTYPE_QZSSHR          = COBBASE_QZSS + 15;
    6969
    7070    COTYPE_AUTO = 0;
    … …  
    7575    CBTYPE_GLONASS = COBBASE_GLONASS + 2;
    7676    CBTYPE_GALILEO = COBBASE_GALILEO + 6;
     77    CBTYPE_BDS     = COBBASE_BDS     + 6;
    7778    CBTYPE_QZSS    = COBBASE_QZSS    + 6;
    78     CBTYPE_BDS     = COBBASE_BDS     + 6;
    7979    CBTYPE_AUTO = 0;
    8080  };
    … …  
    8383    PBTYPE_BASE    = 85;
    8484    PBTYPE_GPS     = PBTYPE_BASE;
    85     PBTYPE_GLONASS = PBTYPE_GPS++;
    86     PBTYPE_GALILEO = PBTYPE_GLONASS++;
    87     PBTYPE_BDS     = PBTYPE_GALILEO++;
    88     PBTYPE_QZSS    = PBTYPE_BDS++;
     85    PBTYPE_GLONASS = PBTYPE_BASE + 1;
     86    PBTYPE_GALILEO = PBTYPE_BASE + 2;
     87    PBTYPE_BDS     = PBTYPE_BASE + 3;
     88    PBTYPE_QZSS    = PBTYPE_BASE + 4;
    8989    PBTYPE_AUTO = 0;
    9090  };
    … …  
    9393    PBEXTTYPE_BASE    = 90;
    9494    PBEXTTYPE_GPS     = PBEXTTYPE_BASE;
    95     PBEXTTYPE_GLONASS = PBEXTTYPE_GPS++;
    96     PBEXTTYPE_GALILEO = PBEXTTYPE_GLONASS++;
    97     PBEXTTYPE_BDS     = PBEXTTYPE_GALILEO++;
    98     PBEXTTYPE_QZSS    = PBEXTTYPE_BDS++;
     95    PBEXTTYPE_GLONASS = PBEXTTYPE_BASE + 1;
     96    PBEXTTYPE_GALILEO = PBEXTTYPE_BASE + 2;
     97    PBEXTTYPE_BDS     = PBEXTTYPE_BASE + 3;
     98    PBEXTTYPE_QZSS    = PBEXTTYPE_BASE + 4;
    9999    PBEXTTYPE_AUTO = 0;
    100100  };
    … …  
    105105    SATANTTYPE_BASE    = 80;
    106106    SATANTTYPE_GPS     = SATANTTYPE_BASE;
    107     SATANTTYPE_GLONASS = SATANTTYPE_GPS++;
    108     SATANTTYPE_GALILEO = SATANTTYPE_GLONASS++;
    109     SATANTTYPE_BDS     = SATANTTYPE_GALILEO++;
    110     SATANTTYPE_QZSS    = SATANTTYPE_BDS++;
     107    SATANTTYPE_GLONASS = SATANTTYPE_BASE + 1;
     108    SATANTTYPE_GALILEO = SATANTTYPE_BASE + 2;
     109    SATANTTYPE_BDS     = SATANTTYPE_BASE + 3;
     110    SATANTTYPE_QZSS    = SATANTTYPE_BASE + 4;
    111111    SATANTTYPE_AUTO    = 0;
    112112  };
    … …  
    123123    REGIONOTYPE_BASE    = 96;
    124124    REGIONOTYPE_GPS     = REGIONOTYPE_BASE;
    125     REGIONOTYPE_GLONASS = REGIONOTYPE_GPS++;
    126     REGIONOTYPE_GALILEO = REGIONOTYPE_GLONASS++;
    127     REGIONOTYPE_BDS     = REGIONOTYPE_GALILEO++;
    128     REGIONOTYPE_QZSS    = REGIONOTYPE_BDS++;
     125    REGIONOTYPE_GLONASS = REGIONOTYPE_BASE + 1;
     126    REGIONOTYPE_GALILEO = REGIONOTYPE_BASE + 2;
     127    REGIONOTYPE_BDS     = REGIONOTYPE_BASE + 3;
     128    REGIONOTYPE_QZSS    = REGIONOTYPE_BASE + 4;
    129129    REGIONOTYPE_AUTO    = 0;
    130130  }
Note: See TracChangeset for help on using the changeset viewer.