Changeset 8308 in ntrip


Ignore:
Timestamp:
Mar 23, 2018, 12:27:58 PM (4 months ago)
Author:
stuerze
Message:

consideration of DF range 0-63 for SSR Satellite IDs as defined in DF463, DF466 (first BDS or SBAS satellite is 0)

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

    r8204 r8308  
    275275
    276276      t_orbCorr orbCorr;
    277       orbCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID, flag);
     277      int satID = _clkOrb.Sat[ii].ID;
     278      if (sysCh == 'C' || sysCh == 'S') {
     279        satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
     280      }
     281      orbCorr._prn.set(sysCh, satID, flag);
    278282      orbCorr._staID     = _staID.toStdString();
    279283      orbCorr._iod       = _clkOrb.Sat[ii].IOD;
     
    309313
    310314      t_clkCorr clkCorr;
    311       clkCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID, flag);
    312 
     315      int satID = _clkOrb.Sat[ii].ID;
     316      if (sysCh == 'C' || sysCh == 'S') {
     317        satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
     318      }
     319      clkCorr._prn.set(sysCh, satID, flag);
    313320      clkCorr._staID      = _staID.toStdString();
    314321      clkCorr._time       = _lastTime;
     
    386393    }
    387394    t_satCodeBias satCodeBias;
    388     satCodeBias._prn.set(sysCh, _codeBias.Sat[ii].ID);
     395    int satID = _codeBias.Sat[ii].ID;
     396    if (sysCh == 'C' || sysCh == 'S') {
     397      satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
     398    }
     399    satCodeBias._prn.set(sysCh, satID);
    389400    satCodeBias._staID     = _staID.toStdString();
    390401    satCodeBias._time      = _lastTime;
     
    439450    }
    440451    t_satPhaseBias satPhaseBias;
    441     satPhaseBias._prn.set(sysCh, _phaseBias.Sat[ii].ID);
     452    int satID = _phaseBias.Sat[ii].ID;
     453    if (sysCh == 'C' || sysCh == 'S') {
     454      satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
     455    }
     456    satPhaseBias._prn.set(sysCh, satID);
    442457    satPhaseBias._staID      = _staID.toStdString();
    443458    satPhaseBias._time       = _lastTime;
  • trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

    r8275 r8308  
    601601      if (biasSat) {
    602602        biasSat->ID = prn.number();
     603        if (prn.system() == 'C' ||
     604            prn.system() == 'S') {
     605          biasSat->ID--; // DF463 and DF466 with DF range 0-63, first satellite shall be 0
     606        }
    603607        biasSat->NumberOfCodeBiases = 0;
    604608        if (prn.system() == 'G') {
     
    12041208        phasebias.MWConsistencyIndicator = mwConsistencyIndicator;
    12051209        phasebiasSat->ID = prn.number();
     1210        if (prn.system() == 'C' ||
     1211            prn.system() == 'S') {
     1212          phasebiasSat->ID--; // DF463 and DF466 with DF range 0-63, first satellite shall be 0
     1213        }
    12061214        phasebiasSat->NumberOfPhaseBiases = 0;
    12071215        phasebiasSat->YawAngle = pbSat.yawAngle;
     
    23302338  if (sd) {
    23312339    sd->ID = prn.mid(1).toInt();
     2340    char sys =  prn.mid(0,1).at(0).toLatin1();
     2341    if ( sys == 'C' ||
     2342         sys == 'S') {
     2343      sd->ID--;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
     2344    }
    23322345    sd->IOD = eph->IOD();
    23332346    sd->Clock.DeltaA0 = dClk;
Note: See TracChangeset for help on using the changeset viewer.