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

Timestamp:

Aug 31, 2026, 5:27:46 PM (2 months ago)

Author:

stuerze

Message:

updates regarding RTCM-SSR

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (1 diff)
• RTCM3coDecoder.cpp (modified) (2 diffs)
• clock_and_orbit/clock_orbit_rtcm_new.cpp (modified) (5 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -2263 +2263 @@
       if ((id >= 1057 && id <= 1068) ||
           (id >= 1240 && id <= 1270) ||
+          (id > 0     && id <= 100) ||
           (id == 4076)) {
         if (!_coDecoders.contains(_staID.toLatin1())) {

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -505 +505 @@
     satPhaseBias._ssrFormat  = (_type == RTCMssr) ? ssrRtcmOld :
                                (_type == RTCMnewssr) ? ssrRtcmNew : ssrUnknown;
-    satPhaseBias._dispBiasConsistInd = _phaseBias.DispersiveBiasConsistencyIndicator;
-    satPhaseBias._MelbWuebConsistInd = _phaseBias.MWConsistencyIndicator;
+    if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) {
+      satPhaseBias._satYawInfoInd = _phaseBias.SatelliteYawInformationIndicator;
+      satPhaseBias._extPBPhaseInd = _phaseBias.ExtendedPhaseBiasPropertyID;
+    }  
+    else {
+      satPhaseBias._dispBiasConsistInd = _phaseBias.DispersiveBiasConsistencyIndicator;
+      satPhaseBias._MelbWuebConsistInd = _phaseBias.MWConsistencyIndicator;
+    }
     satPhaseBias._yaw     = _phaseBias.Sat[ii].YawAngle;
     satPhaseBias._yawRate = _phaseBias.Sat[ii].YawRate;
@@ -513 +519 @@
       t_frqPhaseBias frqPhaseBias;
       frqPhaseBias._rnxType2ch.assign(_ssrCorr->codeTypeToRnxType(sys, biasEntry.Type));
-      frqPhaseBias._value                = biasEntry.Bias;
-      frqPhaseBias._fixIndicator         = biasEntry.IntegerIndicator;
-      frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator;
-      frqPhaseBias._jumpCounter          = biasEntry.DiscontinuityCounter;
+      frqPhaseBias._value        = biasEntry.Bias;
+      frqPhaseBias._fixIndicator = biasEntry.IntegerIndicator;
+      if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) {
+        if (satPhaseBias._extPBPhaseInd) {
+          frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator;
+        }
+      }
+      else {
+        frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator;
+      }
+      frqPhaseBias._jumpCounter = biasEntry.DiscontinuityCounter;
       if (!frqPhaseBias._rnxType2ch.empty()) {
         satPhaseBias._bias.push_back(frqPhaseBias);

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp

@@ -380 +380 @@
         E_GPS_SATELLITE_ID(b->Sat[i].ID)
         E_NO_OF_BIASES(b->Sat[i].NumberOfPhaseBiases)
-        E_YAW_ANGLE(b->Sat[i].YawAngle)
-        E_YAW_RATE(b->Sat[i].YawRate)
+        if (b->SatelliteYawInformationIndicator) {
+          E_YAW_ANGLE(b->Sat[i].YawAngle)
+          E_YAW_RATE(b->Sat[i].YawRate)
+        }
         for (j = 0; j < b->Sat[i].NumberOfPhaseBiases; ++j) {
           E_GNSS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type)
@@ -605 +607 @@
             pb->Sat[pos].ID = id;
             D_NO_OF_BIASES(pb->Sat[pos].NumberOfPhaseBiases)
-            D_YAW_ANGLE(pb->Sat[pos].YawAngle)
-            D_YAW_RATE(pb->Sat[pos].YawRate)
+            if (pb->SatelliteYawInformationIndicator) {
+              D_YAW_ANGLE(pb->Sat[pos].YawAngle)
+              D_YAW_RATE(pb->Sat[pos].YawRate)
+            }
 #ifdef BNC_DEBUG_SSR
             fprintf(stderr, "id %2d #%d y %10.6f yr %10.6f ",
@@ -619 +623 @@
               D_PHASE_BIAS_CORRECTION(pb->Sat[pos].Biases[j].Bias)
 #ifdef BNC_DEBUG_SSR
-              fprintf(stderr, "t%02d int %d disc %d b %8.4f ",
+              fprintf(stderr, "t %02d int %02d disc %d b %8.4f ",
                       pb->Sat[pos].Biases[j].Type,
                                                     pb->Sat[pos].Biases[j].IntegerIndicator,
@@ -677 +681 @@
               D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j].WidelaneGroupIndicator)
 #ifdef BNC_DEBUG_SSR
-              fprintf(stderr, "t%02d int %d /*wl %d*/ disc %d b %8.4f ",
+              fprintf(stderr, "t %02d wl %d ",
                       pb->Sat[pos].Biases[j].Type,
-                                          pb->Sat[pos].Biases[j].IntegerIndicator,
-                                          pb->Sat[pos].Biases[j].WidelaneGroupIndicator,
-                                          pb->Sat[pos].Biases[j].DiscontinuityCounter,
-                                          pb->Sat[pos].Biases[j].Bias);
+                                                    pb->Sat[pos].Biases[j].WidelaneGroupIndicator);
 #endif
             }
@@ -1038 +1039 @@
               D_CODE_BIAS(b->Sat[pos].Biases[j].Bias)
 #ifdef BNC_DEBUG_SSR
-            fprintf(stderr, "t%02d b %8.2f ",
+            fprintf(stderr, "t %02d b %8.2f ",
                     b->Sat[pos].Biases[j].Type, b->Sat[pos].Biases[j].Bias);
 #endif