Changeset 6553 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Jan 19, 2015, 11:23:32 AM (10 years ago)

Author:

stuerze

Message:

update interval considered during ssr reference time determination

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (2 diffs)
• RTCM3coDecoder.h (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -191 +191 @@
       if (irc == GCOBR_OK || irc == GCOBR_MESSAGEFOLLOWS ) {
 
-        setEpochTime(); // sets _lastTime
+        setReferenceTime(); // sets _lastTime
  
         if (_lastTime.valid()) { 
@@ -463 +463 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void RTCM3coDecoder::setEpochTime() {
+void RTCM3coDecoder::setReferenceTime() {
 
   _lastTime.reset();
 
-  int epoSecGPS = -1;
-  int epoSecGlo = -1;
+  const QVector<int> updateInt = QVector<int>()  << 1 << 2 << 5 << 10 << 15 << 30
+                                                 << 60 << 120 << 240 << 300 << 600
+                                                 << 900 << 1800 << 3600 << 7200
+                                                 << 10800;
+  double epoSecGPS = -1.0;
+  double epoSecGlo = -1.0;
   if      (_clkOrb.NumberOfSat[CLOCKORBIT_SATGPS] > 0) {
-    epoSecGPS = _clkOrb.EpochTime[CLOCKORBIT_SATGPS];        // 0 .. 604799 s  
+    epoSecGPS = _clkOrb.EpochTime[CLOCKORBIT_SATGPS];        // 0 .. 604799 s
+    if (_clkOrb.UpdateInterval) {
+      epoSecGPS += 0.5 * updateInt[_clkOrb.UpdateInterval];
+    }
   }
   else if (_codeBias.NumberOfSat[CLOCKORBIT_SATGPS] > 0) {
     epoSecGPS = _codeBias.EpochTime[CLOCKORBIT_SATGPS];      // 0 .. 604799 s  
+    if (_codeBias.UpdateInterval) {
+      epoSecGPS += 0.5 * updateInt[_codeBias.UpdateInterval];
+    }
   }
   else if (_phaseBias.NumberOfSat[CLOCKORBIT_SATGPS] > 0) {
     epoSecGPS = _phaseBias.EpochTime[CLOCKORBIT_SATGPS];     // 0 .. 604799 s  
+    if (_phaseBias.UpdateInterval) {
+      epoSecGPS += 0.5 * updateInt[_phaseBias.UpdateInterval];
+    }
   }
   else if (_vTEC.NumLayers > 0) {
     epoSecGPS = _vTEC.EpochTime;                             // 0 .. 604799 s  
+    if (_vTEC.UpdateInterval) {
+      epoSecGPS += 0.5 * updateInt[_vTEC.UpdateInterval];
+    }
   }
   else if (_clkOrb.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) {
     epoSecGlo = _clkOrb.EpochTime[CLOCKORBIT_SATGLONASS];    // 0 .. 86399 s
+    if (_clkOrb.UpdateInterval) {
+      epoSecGlo += 0.5 * updateInt[_clkOrb.UpdateInterval];
+    }
   }
   else if (_codeBias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) {
     epoSecGlo = _codeBias.EpochTime[CLOCKORBIT_SATGLONASS];  // 0 .. 86399 s
+    if (_codeBias.UpdateInterval) {
+      epoSecGlo += 0.5 * updateInt[_codeBias.UpdateInterval];
+    }
   }
   else if (_phaseBias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) {
     epoSecGlo = _phaseBias.EpochTime[CLOCKORBIT_SATGLONASS]; // 0 .. 86399 s
+    if (_phaseBias.UpdateInterval) {
+      epoSecGlo += 0.5 * updateInt[_phaseBias.UpdateInterval];
+    }
   }
 

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -54 +54 @@
  private:
   void reset();
-  void setEpochTime();
+  void setReferenceTime();
   void sendResults();
   void reopen();