Changeset 10999 in ntrip

Timestamp:

Aug 31, 2026, 8:30:19 AM (14 hours ago)

Author:

stuerze

Message:

minor changes regarding RTCM-SSR

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• satObs.cpp (modified) (3 diffs)
• satObs.h (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -504 +504 @@
     satPhaseBias._updateInt  = _phaseBias.UpdateInterval;
     satPhaseBias._ssrFormat  = (_type == RTCMssr) ? ssrRtcmOld :
-                                (_type == RTCMnewssr) ? ssrRtcmNew : ssrUnknown;
-    satPhaseBias._dispBiasConstistInd = _phaseBias.DispersiveBiasConsistencyIndicator;
-    satPhaseBias._MWConsistInd        = _phaseBias.MWConsistencyIndicator;
+                               (_type == RTCMnewssr) ? ssrRtcmNew : ssrUnknown;
+    satPhaseBias._dispBiasConsistInd = _phaseBias.DispersiveBiasConsistencyIndicator;
+    satPhaseBias._MelbWuebConsistInd = _phaseBias.MWConsistencyIndicator;
     satPhaseBias._yaw     = _phaseBias.Sat[ii].YawAngle;
     satPhaseBias._yawRate = _phaseBias.Sat[ii].YawRate;

trunk/BNC/src/satObs.cpp

@@ -314 +314 @@
            << satPhaseBias._updateInt <<  " "
            << biasList.size() << ' ' << satPhaseBias._staID <<  endl;
-      *out << " " << static_cast<int>(satPhaseBias._ssrFormat) << "   "
-           << satPhaseBias._dispBiasConstistInd << "   "
-           << satPhaseBias._MWConsistInd << endl;
+
+      if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) {
+        *out << " " << static_cast<int>(satPhaseBias._ssrFormat) << "   "
+             << satPhaseBias._satYawInfoInd << "   "
+             << satPhaseBias._extPBPhaseInd << endl;
+      } else  {
+          *out << " " << static_cast<int>(satPhaseBias._ssrFormat) << "   "
+             << satPhaseBias._dispBiasConsistInd << "   "
+             << satPhaseBias._MelbWuebConsistInd << endl;
+      }
     }
     *out << satPhaseBias._prn.toString() << ' '
@@ -342 +349 @@
   int          numSat;
   string       staID;
-  unsigned int dispInd;
-  unsigned int mwInd;
+  unsigned int metadata1;
+  unsigned int metadata2;
   e_ssrFormat  ssrFormat = ssrUnknown;
   if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numSat, staID) != t_corrSSR::phaseBias) {
@@ -360 +367 @@
     if (ii == 0) {
       int ssrFormatInt = 0;
-      in >> ssrFormatInt >> dispInd >> mwInd;
+      in >> ssrFormatInt >> metadata1 >> metadata2;
       ssrFormat = static_cast<e_ssrFormat>(ssrFormatInt);
       continue;
     }
     satPhaseBias._ssrFormat = ssrFormat;
-    satPhaseBias._dispBiasConstistInd = dispInd;
-    satPhaseBias._MWConsistInd = mwInd;
-
+    switch(ssrFormat) {
+      case e_ssrFormat::ssrRtcmNew:
+        satPhaseBias._dispBiasConsistInd = metadata1;
+        satPhaseBias._MelbWuebConsistInd = metadata2;
+        break;
+      case e_ssrFormat::ssrRtcmOld:
+      case e_ssrFormat::ssrUnknown:
+        satPhaseBias._satYawInfoInd = metadata1;
+        satPhaseBias._extPBPhaseInd = metadata2;
+        break;
+    }
     int numBias;
     double yawDeg, yawDegRate;

trunk/BNC/src/satObs.h

@@ -197 +197 @@
     _updateInt  = 0;
     _ssrFormat  = ssrUnknown;
-    _dispBiasConstistInd = 0;
-    _MWConsistInd = 0;
-    _yaw        = 0.0;
-    _yawRate    = 0.0;
+    _dispBiasConsistInd = 0;
+    _MelbWuebConsistInd = 0;
+    _satYawInfoInd = 0;
+    _extPBPhaseInd = 0;
+    _yaw           = 0.0;
+    _yawRate       = 0.0;
   }
   static void writeEpoch(std::ostream* out, const QList<t_satPhaseBias>& biasList);
@@ -209 +211 @@
   unsigned int                _updateInt;           // not satellite specific
   e_ssrFormat                 _ssrFormat;           // not satellite specific
-  unsigned int                _dispBiasConstistInd; // not satellite specific
-  unsigned int                _MWConsistInd;        // not satellite specific
+  // IGS-SSR
+  unsigned int                _dispBiasConsistInd;  // not satellite specific
+  unsigned int                _MelbWuebConsistInd;  // not satellite specific
+  // RTCM-SSR
+  unsigned int                _satYawInfoInd;       // not satellite specific
+  unsigned int                _extPBPhaseInd;       // not satellite specific
   double                      _yaw;
   double                      _yawRate;