Index: /trunk/BNC/src/PPP/pppClient.cpp
===================================================================
--- /trunk/BNC/src/PPP/pppClient.cpp	(revision 9550)
+++ /trunk/BNC/src/PPP/pppClient.cpp	(revision 9551)
@@ -669,4 +669,7 @@
       if (_filter->processEpoch() != success) {
         LOG << "filter->processEpoch() != success" << endl;
+        if (_filter->ageOfLastSolutionOK() >= 120) {
+          reset();
+        }
         return finish(failure,7);
       }
Index: /trunk/BNC/src/PPP/pppFilter.h
===================================================================
--- /trunk/BNC/src/PPP/pppFilter.h	(revision 9550)
+++ /trunk/BNC/src/PPP/pppFilter.h	(revision 9551)
@@ -61,4 +61,5 @@
     return 0.0;
   };
+  double ageOfLastSolutionOK() { return (_epoTime - _lastEpoTimeOK);}
 
  private:
Index: /trunk/BNC/src/PPP/pppParlist.cpp
===================================================================
--- /trunk/BNC/src/PPP/pppParlist.cpp	(revision 9550)
+++ /trunk/BNC/src/PPP/pppParlist.cpp	(revision 9551)
@@ -675,5 +675,4 @@
         required.push_back(new t_pppParam(t_pppParam::pBiasR2, t_prn(), t_lc::l2));
       }
-
     }
     if (_usedSystems.contains('E')) {
Index: /trunk/BNC/src/PPP/pppSatObs.cpp
===================================================================
--- /trunk/BNC/src/PPP/pppSatObs.cpp	(revision 9550)
+++ /trunk/BNC/src/PPP/pppSatObs.cpp	(revision 9551)
@@ -305,14 +305,9 @@
 
   retVal = sqrt(retVal);
-/*
-  // De-Weight GLONASS
+
+  /* De-Weight GLONASS
   // -----------------
-  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 5.0;
-  }
-
-  // De-Weight BDS
-  // -------------
-  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+  if ((OPT->_obsModelType == OPT->DCMphaseBias && _prn.system() == 'R' ) &&
+      (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)) ) {
     retVal *= 2.0;
   }
@@ -353,17 +348,4 @@
 
   retVal = sqrt(retVal);
-/*
-  // De-Weight GLONASS
-  // -----------------
-  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 5.0;
-  }
-
-  // De-Weight BDS
-  // -------------
-  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 2.0;
-  }
-*/
 
   return retVal;