Changeset 9551 in ntrip


Ignore:
Timestamp:
Nov 23, 2021, 2:35:04 PM (15 months ago)
Author:
stuerze
Message:

update regarding PPP

Location:
trunk/BNC/src/PPP
Files:
4 edited

Legend:

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

    r9548 r9551  
    669669      if (_filter->processEpoch() != success) {
    670670        LOG << "filter->processEpoch() != success" << endl;
     671        if (_filter->ageOfLastSolutionOK() >= 120) {
     672          reset();
     673        }
    671674        return finish(failure,7);
    672675      }
  • trunk/BNC/src/PPP/pppFilter.h

    r9527 r9551  
    6161    return 0.0;
    6262  };
     63  double ageOfLastSolutionOK() { return (_epoTime - _lastEpoTimeOK);}
    6364
    6465 private:
  • trunk/BNC/src/PPP/pppParlist.cpp

    r9549 r9551  
    675675        required.push_back(new t_pppParam(t_pppParam::pBiasR2, t_prn(), t_lc::l2));
    676676      }
    677 
    678677    }
    679678    if (_usedSystems.contains('E')) {
  • trunk/BNC/src/PPP/pppSatObs.cpp

    r9548 r9551  
    305305
    306306  retVal = sqrt(retVal);
    307 /*
    308   // De-Weight GLONASS
     307
     308  /* De-Weight GLONASS
    309309  // -----------------
    310   if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
    311     retVal *= 5.0;
    312   }
    313 
    314   // De-Weight BDS
    315   // -------------
    316   if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
     310  if ((OPT->_obsModelType == OPT->DCMphaseBias && _prn.system() == 'R' ) &&
     311      (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)) ) {
    317312    retVal *= 2.0;
    318313  }
     
    353348
    354349  retVal = sqrt(retVal);
    355 /*
    356   // De-Weight GLONASS
    357   // -----------------
    358   if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
    359     retVal *= 5.0;
    360   }
    361 
    362   // De-Weight BDS
    363   // -------------
    364   if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
    365     retVal *= 2.0;
    366   }
    367 */
    368350
    369351  return retVal;
Note: See TracChangeset for help on using the changeset viewer.