Changeset 8312 in ntrip


Ignore:
Timestamp:
Mar 28, 2018, 9:35:46 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:
branches/BNC_2.12
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/ChangeLog.txt

    r8307 r8312  
    77    CHANGED (28.09.2017): Transformation of orbit and clock corrections into ETRF2000,
    88                          NDA83 or DREF91 is done temporarily via ITRF2008
    9     FIXED   (22.03.2018): consideration of DF range 0-63 for SSR Satellite IDs as
    10                           defined in DF463, DF466. First BDS or SBAS satellite is 0
    119    FIXED   (05.02.2018): Bug in latency checker
    1210    FIXED   (13.12.2017): Galileo geocentric gravitational constant is corrected
  • branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.cpp

    r8307 r8312  
    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;
     
    713697      case CODETYPEGPS_L2_Z:          return "2W";
    714698      //case CODETYPEGPS_L2_Y:          return "2Y";
    715       //case CODETYPEGPS_L2_M:          return "2M";     
     699      //case CODETYPEGPS_L2_M:          return "2M";
    716700      case CODETYPEGPS_L5_I:          return "5I";
    717701      case CODETYPEGPS_L5_Q:          return "5Q";
     
    731715      case CODETYPEGLONASS_L3_I:      return "3I";
    732716      case CODETYPEGLONASS_L3_Q:      return "3Q";
    733       case CODETYPEGLONASS_L3_IQ:     return "3X";     
     717      case CODETYPEGLONASS_L3_IQ:     return "3X";
    734718      default: return "";
    735719    }
  • branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

    r8307 r8312  
    599599      if (biasSat) {
    600600        biasSat->ID = prn.number();
    601         if (prn.system() == 'C' ||
    602             prn.system() == 'S') {
    603           biasSat->ID--; // DF463 and DF466 with DF range 0-63, first satellite shall be 0
    604         }
    605601        biasSat->NumberOfCodeBiases = 0;
    606602        if (prn.system() == 'G') {
     
    12061202        phasebias.MWConsistencyIndicator = mwConsistencyIndicator;
    12071203        phasebiasSat->ID = prn.number();
    1208         if (prn.system() == 'C' ||
    1209             prn.system() == 'S') {
    1210           phasebiasSat->ID--; // DF463 and DF466 with DF range 0-63, first satellite shall be 0
    1211         }       
    12121204        phasebiasSat->NumberOfPhaseBiases = 0;
    12131205        phasebiasSat->YawAngle = pbSat.yawAngle;
     
    23362328  if (sd) {
    23372329    sd->ID = prn.mid(1).toInt();
    2338     char sys =  prn.mid(0,1).at(0).toLatin1();
    2339     if ( sys == 'C' ||
    2340          sys == 'S') {
    2341       sd->ID--;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
    2342     }   
    23432330    sd->IOD = eph->IOD();
    23442331    sd->Clock.DeltaA0 = dClk;
Note: See TracChangeset for help on using the changeset viewer.