Changeset 11047 in ntrip for trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

Timestamp:

Sep 28, 2026, 11:17:34 AM (12 hours ago)

Author:

stuerze

Message:

updates regarding RTCM-SSR and some ovarall improvements

File:

• trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (modified) (11 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -141 +141 @@
     flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
     CurrentObs._prn.set(sys, num, flag);
+    checkPrnRange(CurrentObs._prn);
 
     t_frqObs *frqObs = new t_frqObs;
@@ -723 +724 @@
           else
             CurrentObs._prn.set(sys, RTCM3_MSM_NUMSAT - i);
+          checkPrnRange(CurrentObs._prn);
           j = RTCM3_MSM_NUMSIG;
           while (!(sigmask & (1 << --j)))
@@ -954 +956 @@
     int flag = t_corrSSR::getSsrNavTypeFlag(sys, sv);
     CurrentObs._prn.set(sys, sv, flag);
+    checkPrnRange(CurrentObs._prn);
     GETBITS(code, 1)
     GETBITS(freq, 5)
-    GLOFreq[sv - 1] = 100 + freq - 7; /* store frequency for other users (MSM) */
+    if (sv >= 1) { /* 6-bit slot 1..63 fits GLOFreq[64]; 0 is invalid */
+      GLOFreq[sv - 1] = 100 + freq - 7; /* store frequency for other users (MSM) */
+    }
 
     t_frqObs *frqObs = new t_frqObs;
@@ -1066 +1071 @@
     }
     eph._prn.set('G', i);
+    checkPrnRange(eph._prn);
     GETBITS(week, 10)
     if (week < 0 || week > 1023) {
@@ -1185 +1191 @@
     }
     eph._prn.set('R', sv);
+    checkPrnRange(eph._prn);
 
     GETBITS(i, 5)
@@ -1373 +1380 @@
     }
     eph._prn.set('J', i);
+    checkPrnRange(eph._prn);
 
     GETBITS(i, 16)
@@ -1493 +1501 @@
     }
     eph._prn.set('I', i);
+    checkPrnRange(eph._prn);
     GETBITS(week, 10)
     if (week < 0 || week > 1023) {
@@ -1627 +1636 @@
     }
     eph._prn.set('S', 20 + i);
+    checkPrnRange(eph._prn);
     GETBITS(eph._IODN, 8)
     GETBITS(i, 13)
@@ -1716 +1726 @@
     }
     eph._prn.set('E', i, eph._inav ? t_eph::INAV : t_eph::FNAV);
+    checkPrnRange(eph._prn);
 
     GETBITS(week, 12) //FIXME: roll-over after week 4095!!
@@ -1863 +1874 @@
     }
     eph._prn.set('C', i);
+    checkPrnRange(eph._prn);
 
     GETBITS(week, 13)
@@ -2439 +2451 @@
 }
 
-
-
-
+// Satellite numbers on the wire can exceed BNC's supported range (e.g. 6-bit
+// IDs up to 63, while t_prn supports G01-G32). They are passed on unchanged,
+// but t_prn::toInt() maps them to the unused index 0, so they are not usable
+// for per-satellite processing - report that once per satellite.
+////////////////////////////////////////////////////////////////////////////
+void RTCM3Decoder::checkPrnRange(const t_prn& prn) {
+  if (prn.toInt() != 0) {
+    return;
+  }
+  QString prnStr = QString::fromStdString(prn.toString());
+  if (!_prnOutOfRangeLogged.contains(prnStr)) {
+    _prnOutOfRangeLogged.insert(prnStr);
+    emit newMessage(QString("%1: satellite %2 outside the range supported by BNC - not usable for processing")
+                    .arg(_staID).arg(prnStr).toLatin1(), true);
+  }
+}