Changeset 8313 in ntrip


Ignore:
Timestamp:
Mar 28, 2018, 9:36:57 AM (3 weeks ago)
Author:
stuerze
Message:

the latest changes regarding SSR Satellite ID for BDS and SBAS are reverted because it is planned to prevent zero for these SSR Satellite IDs

Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r8308 r8313  
    275275
    276276      t_orbCorr orbCorr;
    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);
     277      orbCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID, flag);
    282278      orbCorr._staID     = _staID.toStdString();
    283279      orbCorr._iod       = _clkOrb.Sat[ii].IOD;
     
    313309
    314310      t_clkCorr clkCorr;
    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);
     311      clkCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID, flag);
    320312      clkCorr._staID      = _staID.toStdString();
    321313      clkCorr._time       = _lastTime;
     
    393385    }
    394386    t_satCodeBias satCodeBias;
    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);
     387    satCodeBias._prn.set(sysCh, _codeBias.Sat[ii].ID);
    400388    satCodeBias._staID     = _staID.toStdString();
    401389    satCodeBias._time      = _lastTime;
     
    450438    }
    451439    t_satPhaseBias satPhaseBias;
    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);
     440    satPhaseBias._prn.set(sysCh, _phaseBias.Sat[ii].ID);
    457441    satPhaseBias._staID      = _staID.toStdString();
    458442    satPhaseBias._time       = _lastTime;
  • trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

    r8308 r8313  
    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         }
    607603        biasSat->NumberOfCodeBiases = 0;
    608604        if (prn.system() == 'G') {
     
    12081204        phasebias.MWConsistencyIndicator = mwConsistencyIndicator;
    12091205        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         }
    12141206        phasebiasSat->NumberOfPhaseBiases = 0;
    12151207        phasebiasSat->YawAngle = pbSat.yawAngle;
     
    23382330  if (sd) {
    23392331    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     }
    23452332    sd->IOD = eph->IOD();
    23462333    sd->Clock.DeltaA0 = dClk;
Note: See TracChangeset for help on using the changeset viewer.