Changeset 7014 in ntrip

Timestamp:

Jul 6, 2015, 9:08:35 AM (10 years ago)

Author:

stuerze

Message:

last unit chages cancelled because they all were correct together

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• ephemeris.cpp (modified) (1 diff)
• satObs.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -307 +307 @@
       clkCorr._time       = _lastTime;
       clkCorr._updateInt  = _clkOrb.UpdateInterval;
-      clkCorr._dClk       = _clkOrb.Sat[ii].Clock.DeltaA0;
-      clkCorr._dotDClk    = _clkOrb.Sat[ii].Clock.DeltaA1;
-      clkCorr._dotDotDClk = _clkOrb.Sat[ii].Clock.DeltaA2;
+      clkCorr._dClk       = _clkOrb.Sat[ii].Clock.DeltaA0 / t_CST::c;
+      clkCorr._dotDClk    = _clkOrb.Sat[ii].Clock.DeltaA1 / t_CST::c;
+      clkCorr._dotDotDClk = _clkOrb.Sat[ii].Clock.DeltaA2 / t_CST::c;
 
       _lastClkCorrections[clkCorr._prn] = clkCorr;

trunk/BNC/src/ephemeris.cpp

@@ -78 +78 @@
         dtC -= (0.5 * updateInt[_clkCorr->_updateInt]);
       }
-      xc[3] += (( _clkCorr->_dClk +
-                  _clkCorr->_dotDClk * dtC +
-                  _clkCorr->_dotDotDClk * dtC * dtC
-                ) / t_CST::c);
+      xc[3] += _clkCorr->_dClk + _clkCorr->_dotDClk * dtC + _clkCorr->_dotDotDClk * dtC * dtC;
     }
     else {

trunk/BNC/src/satObs.cpp

@@ -67 +67 @@
       corr._prn.setFlags(1);// I/NAV
     }
+    corr._dClk       /= t_CST::c;
+    corr._dotDClk    /= t_CST::c;
+    corr._dotDotDClk /= t_CST::c;
+
     corrList.push_back(corr);
   }