Changeset 10327 in ntrip


Ignore:
Timestamp:
Feb 8, 2024, 12:17:36 PM (3 weeks ago)
Author:
stuerze
Message:

changes regarding PPP

Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppFilter.cpp

    r10326 r10327  
    326326                                    const vector<t_pppSatObs*> &obsVector) {
    327327
    328   const double SLIP = 20.0;
     328  double SLIP = 20.0;
     329  double fac = 1.0;
     330  if (_lastEpoTimeOK.valid()) {
     331    fac = _epoTime - _lastEpoTimeOK;
     332    if (fac > 60.0 || fac < 1.0) {
     333      fac = 1.0;
     334    }
     335  }
     336  SLIP *= fac;
    329337  string epoTimeStr = string(_epoTime);
    330338  const vector<t_pppParam*> &params = _parlist->params();
  • trunk/BNC/src/PPP/pppSatObs.cpp

    r10256 r10327  
    111111                obs->_codeValid  && obs->_code &&
    112112                obs->_phaseValid && obs->_phase) {
    113               _obs[iFreq] = new t_frqObs(*obs); //cout << "================> newObs: " << obs->_rnxType2ch <<endl;
     113              _obs[iFreq] = new t_frqObs(*obs); //cout << "================> newObs: " << obs->_rnxType2ch << " obs->_lockTime: " << obs->_lockTime << endl;
    114114            }
    115115          }
     
    354354  retVal = sqrt(retVal);
    355355
    356   // De-Weight GLO+BDS
    357   // -----------------
     356  // De-Weight GLO
     357  // -------------
    358358  if (_prn.system() == 'R' && t_lc::includesCode(tLC)) {
    359359    retVal *= GLO_WEIGHT_FACTOR;
    360   }
    361   if (_prn.system() == 'C' && t_lc::includesCode(tLC)){
    362     retVal *= BDS_WEIGHT_FACTOR;
    363360  }
    364361
     
    401398
    402399
    403   // Enlarge maxRes GLO+BDS
    404   /* ----------------------
     400  // Enlarge maxRes GLO
     401  // ------------------
    405402  if (_prn.system() == 'R' && t_lc::includesCode(tLC)) {
    406403    retVal *= GLO_WEIGHT_FACTOR;
    407404  }
    408   if (_prn.system() == 'C' && t_lc::includesCode(tLC)){
    409     retVal *= BDS_WEIGHT_FACTOR;
    410   }*/
    411405
    412406  return retVal;
  • trunk/BNC/src/bnchelp.html

    r10279 r10327  
    40814081      <li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>
    40824082      <li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>
    4083       <li>'Li'    means that uncombined phase data of two frequencies shall be used.</li>
    40844083      <li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>
    40854084      <li>'P1'    means that uncombined code data of one frequency shall be used.</li>
    4086       <li>'L1'    means that uncombined phase data of one frequency shall be used.</li>
    40874085      <li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>
    40884086      <li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>
  • trunk/BNC/src/bncmain.cpp

    r10280 r10327  
    248248      "\n"
    249249      "PPP Client Panel 2 keys:\n"
    250       "   PPP/lcGPS        {Select the kind of linear combination from GPS code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
    251       "   PPP/lcGLONASS    {Select the kind of linear combination from GLONASS code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
    252       "   PPP/lcGalileo    {Select the kind of linear combination from Galileo code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
    253       "   PPP/lcBDS        {Select the kind of linear combination from BDS code and/or phase data [character string: Pi&Li|Pi|Li|P1&L1|P1|L1|P3&L3|P3|L3|no]}\n"
     250      "   PPP/lcGPS        {Select the kind of linear combination from GPS code and/or phase data [character string:     Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
     251      "   PPP/lcGLONASS    {Select the kind of linear combination from GLONASS code and/or phase data [character string: Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
     252      "   PPP/lcGalileo    {Select the kind of linear combination from Galileo code and/or phase data [character string: Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
     253      "   PPP/lcBDS        {Select the kind of linear combination from BDS code and/or phase data [character string:     Pi&Li|Pi|P1&L1|P1|P3&L3|P3|L3|no]}\n"
    254254      "   PPP/sigmaC1      {Sigma for code observations in meters [floating-point number]}\n"
    255255      "   PPP/sigmaL1      {Sigma for phase observations in meters [floating-point number]}\n"
  • trunk/BNC/src/bncwindow.cpp

    r10276 r10327  
    15131513      "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
    15141514      "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
    1515       "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
    15161515      "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
    15171516      "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
    1518       "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
    15191517      "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
    15201518      "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
     
    15301528      "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
    15311529      "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
    1532       "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
    15331530      "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
    15341531      "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
    1535       "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
    15361532      "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
    15371533      "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
     
    15471543      "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
    15481544      "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
    1549       "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
    15501545      "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
    15511546      "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
    1552       "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
    15531547      "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
    15541548      "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
     
    15641558      "<li>'Pi&Li' means that uncombined code and phase data of two frequencies shall be used.</li>"
    15651559      "<li>'Pi'    means that uncombined code data of two frequencies shall be used.</li>"
    1566       "<li>'Li'    means that uncombined phase data of two frequencies shall be used.</li> "
    15671560      "<li>'P1&L1' means that uncombined code and phase data of one frequency shall be used.</li>"
    15681561      "<li>'P1'    means that uncombined code data of one frequency shall be used.</li>"
    1569       "<li>'L1'    means that uncombined phase data of one frequency shall be used.</li> "
    15701562      "<li>'P3&L3' means that the inonosphere-free linear combination of code and phase data shall be used.</li>"
    15711563      "<li>'P3'    means that the inonosphere-free linear combination of code data shall be used.</li>"
  • trunk/BNC/src/pppMain.cpp

    r10326 r10327  
    262262      }
    263263    }
    264     if (settings.value("PPP/lcGPS").toString() == "Li") {
    265       opt->_LCsGPS.push_back(t_lc::l1);
    266       opt->_LCsGPS.push_back(t_lc::l2);
    267       if (opt->_pseudoObsIono) {
    268         opt->_LCsGPS.push_back(t_lc::GIM);
    269       }
    270     }
    271264    if (settings.value("PPP/lcGPS").toString() == "P1&L1") {
    272265      opt->_LCsGPS.push_back(t_lc::c1);
     
    281274          opt->_LCsGPS.push_back(t_lc::GIM);
    282275        }
    283     }
    284     if (settings.value("PPP/lcGPS").toString() == "L1") {
    285       opt->_LCsGPS.push_back(t_lc::l1);
    286       if (opt->_pseudoObsIono) {
    287         opt->_LCsGPS.push_back(t_lc::GIM);
    288       }
    289276    }
    290277    if (settings.value("PPP/lcGPS").toString() == "P3&L3") {
     
    315302      }
    316303    }
    317     if (settings.value("PPP/lcGLONASS").toString() == "Li") {
    318       opt->_LCsGLONASS.push_back(t_lc::l1);
    319       opt->_LCsGLONASS.push_back(t_lc::l2);
    320       if (opt->_pseudoObsIono) {
    321         opt->_LCsGLONASS.push_back(t_lc::GIM);
    322       }
    323     }
    324304    if (settings.value("PPP/lcGLONASS").toString() == "P1&L1") {
    325305      opt->_LCsGLONASS.push_back(t_lc::c1);
     
    334314          opt->_LCsGLONASS.push_back(t_lc::GIM);
    335315        }
    336     }
    337     if (settings.value("PPP/lcGLONASS").toString() == "L1") {
    338       opt->_LCsGLONASS.push_back(t_lc::l1);
    339       if (opt->_pseudoObsIono) {
    340         opt->_LCsGLONASS.push_back(t_lc::GIM);
    341       }
    342316    }
    343317    if (settings.value("PPP/lcGLONASS").toString() == "P3&L3") {
     
    368342      }
    369343    }
    370     if (settings.value("PPP/lcGalileo").toString() == "Li") {
    371       opt->_LCsGalileo.push_back(t_lc::l1);
    372       opt->_LCsGalileo.push_back(t_lc::l2);
    373       if (opt->_pseudoObsIono) {
    374         opt->_LCsGalileo.push_back(t_lc::GIM);
    375       }
    376     }
    377344    if (settings.value("PPP/lcGalileo").toString() == "P1&L1") {
    378345      opt->_LCsGalileo.push_back(t_lc::c1);
     
    387354          opt->_LCsGalileo.push_back(t_lc::GIM);
    388355        }
    389     }
    390     if (settings.value("PPP/lcGalileo").toString() == "L1") {
    391       opt->_LCsGalileo.push_back(t_lc::l1);
    392       if (opt->_pseudoObsIono) {
    393         opt->_LCsGalileo.push_back(t_lc::GIM);
    394       }
    395356    }
    396357    if (settings.value("PPP/lcGalileo").toString() == "P3&L3") {
     
    421382      }
    422383    }
    423     if (settings.value("PPP/lcBDS").toString() == "Li") {
    424       opt->_LCsBDS.push_back(t_lc::l1);
    425       opt->_LCsBDS.push_back(t_lc::l2);
    426       if (opt->_pseudoObsIono) {
    427         opt->_LCsBDS.push_back(t_lc::GIM);
    428       }
    429     }
    430384    if (settings.value("PPP/lcBDS").toString() == "P1&L1") {
    431385      opt->_LCsBDS.push_back(t_lc::c1);
     
    440394          opt->_LCsBDS.push_back(t_lc::GIM);
    441395        }
    442     }
    443     if (settings.value("PPP/lcBDS").toString() == "L1") {
    444       opt->_LCsBDS.push_back(t_lc::l1);
    445       if (opt->_pseudoObsIono) {
    446         opt->_LCsBDS.push_back(t_lc::GIM);
    447       }
    448396    }
    449397    if (settings.value("PPP/lcBDS").toString() == "P3&L3") {
     
    529477    opt->_aprSigClkOff    = 300000.0;
    530478    opt->_aprSigAmb       = 10000.0;
    531     opt->_aprSigIon       = 1.0e8;
    532     opt->_noiseIon        = 1.0e8;
     479    opt->_aprSigIon       = 1.0e3;
     480    opt->_noiseIon        = 1.0e3;
    533481    opt->_aprSigCodeBias  = 10000.0;
    534482    opt->_noiseCodeBias   = 10000.0;
  • trunk/BNC/src/pppWidgets.cpp

    r10251 r10327  
    128128  _lcGPS->addItems(QString("P3,P3&L3").split(","));
    129129#else
    130   _lcGPS->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
     130  _lcGPS->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
    131131#endif
    132132
     
    134134#ifdef USE_PPP_SSR_I
    135135   _lcGLONASS->addItems(QString("no,P3,L3,P3&L3").split(","));
    136 #else 
    137   _lcGLONASS->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
     136#else
     137  _lcGLONASS->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
    138138#endif
    139139
     
    141141#ifdef USE_PPP_SSR_I
    142142  _lcGalileo->addItems(QString("no,P3,L3,P3&L3").split(","));
    143 #else 
    144   _lcGalileo->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
     143#else
     144  _lcGalileo->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
    145145#endif
    146146
     
    148148 #ifdef USE_PPP_SSR_I
    149149  _lcBDS->addItems(QString("no,P3,L3,P3&L3").split(","));
    150 #else 
    151   _lcBDS->addItems(QString("Pi&Li,Pi,Li,P1&L1,P1,L1,P3&L3,P3,L3,no").split(","));
     150#else
     151  _lcBDS->addItems(QString("Pi&Li,Pi,P1&L1,P1,P3&L3,P3,L3,no").split(","));
    152152#endif
    153153
Note: See TracChangeset for help on using the changeset viewer.