Changeset 9559 in ntrip for trunk/BNC/src/PPP/pppParlist.cpp

Timestamp:

Dec 1, 2021, 5:47:15 PM (2 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (6 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -102 +102 @@
       _noise   = OPT->_noiseIon;
      break;
-   case cBiasG1:   case cBiasR1:   case cBiasE1:   case cBiasC1:
-   case cBiasG2:   case cBiasR2:   case cBiasE2:   case cBiasC2:
+   case cBiasG1:   case cBiasE1:   case cBiasC1:
+   case cBiasG2:   case cBiasE2:   case cBiasC2:
      _epoSpec = false;
      _sigma0  = OPT->_aprSigCodeBias;
@@ -246 +246 @@
     if ((obs->prn().system() == 'G') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;}
     break;
-  case cBiasR1:
-    if ((obs->prn().system() == 'R') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;}
-    break;
   case cBiasE1:
     if ((obs->prn().system() == 'E') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;}
@@ -257 +254 @@
   case cBiasG2:
     if ((obs->prn().system() == 'G') && (tLC == t_lc::c2)) {return 1.0;} else {return 0.0;}
-    break;
-  case cBiasR2:
-    if ((obs->prn().system() == 'R') && (tLC == t_lc::c2)) {return 1.0;} else {return 0.0;}
     break;
   case cBiasE2:
@@ -328 +322 @@
   case cBiasG2:  case pBiasG2:
     ss << "BIA  " << left << setw(3) << t_lc::toString(_tLC) << right << " G  ";
-    break;
-  case cBiasR1:
-  case cBiasR2:
-    ss << "BIA  " << left << setw(3) << t_lc::toString(_tLC) << right << " R  ";
     break;
   case cBiasE1:  case pBiasE1:
@@ -519 +509 @@
         it = _params.erase(it);
       }
-      else if ((par->type() == t_pppParam::cBiasR1 ||
-                par->type() == t_pppParam::cBiasR2) && !usedSystems().contains('R')) {
-#ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
-#endif
-        delete par;
-        it = _params.erase(it);
-      }
       else if ((par->type() == t_pppParam::cBiasE1 ||
                 par->type() == t_pppParam::cBiasE2 ||
@@ -594 +576 @@
       }
     }
-    if (_usedSystems.contains('R')) {
-      lc = OPT->LCs('R');
-      if (std::find(lc.begin(), lc.end(), t_lc::c1) != lc.end()) {
-        required.push_back(new t_pppParam(t_pppParam::cBiasR1, t_prn(), t_lc::c1));
-      }
-      if (std::find(lc.begin(), lc.end(), t_lc::c2) != lc.end()) {
-        required.push_back(new t_pppParam(t_pppParam::cBiasR2, t_prn(), t_lc::c2));
-      }
-    }
     if (_usedSystems.contains('E')) {
       lc = OPT->LCs('E');