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

Timestamp:

Nov 10, 2026, 12:11:31 PM (3 days ago)

Author:

stuerze

Message:

Structured logging improved

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (12 diffs)
• crs.h (modified) (6 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -139 +139 @@
     CurrentObs._time = CurrentObsTime;
     CurrentObs._type = type;
+    CurrentObs._size = int(_currMsg._size);
 
     GETBITS(sv, 6)
@@ -734 +735 @@
           CurrentObs._time = CurrentObsTime;
           CurrentObs._type = type;
+          CurrentObs._size = int(_currMsg._size);
           if (sys == 'S')
             CurrentObs._prn.set(sys, 20 - 1 + RTCM3_MSM_NUMSAT - i);
@@ -965 +967 @@
     CurrentObs._time = CurrentObsTime;
     CurrentObs._type = type;
+    CurrentObs._size = int(_currMsg._size);
 
     GETBITS(sv, 6)
@@ -1348 +1351 @@
     GLOFreq[sv - 1] = 100 + eph._frq_num ; /* store frequency for other users (MSM) */
     _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frq_num, 2, 'f', 0);
+    _gloFrqSource = _currMsg;
 
     if (eph.validMdata()) {
@@ -2021 +2025 @@
     memcpy(_antType.back()._descriptor, antenna, antnum);
     _antType.back()._descriptor[antnum] = 0;
+    _antType.back()._source = _currMsg;
   }
   SKIPBITS(8) /* antenna setup ID */
@@ -2041 +2046 @@
       memcpy(_recType.back()._descriptor, receiver, recnum);
       _recType.back()._descriptor[recnum] = 0;
+      _recType.back()._source = _currMsg;
       if (recfirnum > -1 && recfirnum < 265) {
         memcpy(_recType.back()._firmware, rec_firmware, recfirnum);
@@ -2067 +2073 @@
   _antList.push_back(t_antRefPoint());
   _antList.back()._type = t_antRefPoint::ARP;
+  _antList.back()._source = _currMsg;
   SKIPBITS(22)
   GETBITSSIGN(x, 38)
@@ -2127 +2134 @@
   if (_gloBiasInfo != gloBiasInfo) {
     _gloBiasInfo.set(gloBiasInfo);
+    _gloBiasSource = _currMsg;
   }
   return true;
@@ -2153 +2161 @@
   if (_serviceCrs.empty() ||
       (strncmp(_serviceCrs.back()._name, serviceCrs._name, servicecrsnum) != 0)) {
+    serviceCrs._msgType = _currMsg._type;
+    serviceCrs._msgSize = int(_currMsg._size);
     _serviceCrs.push_back(serviceCrs);
     GETFLOAT(_serviceCrs.back()._CE, 16, 1/100.0)
@@ -2184 +2194 @@
   if (_rtcmCrs.empty() ||
       (strncmp(_rtcmCrs.back()._name, rtcmCrs._name, rtcmcrsnum) != 0)) {
+    rtcmCrs._msgType = _currMsg._type;
+    rtcmCrs._msgSize = int(_currMsg._size);
     _rtcmCrs.push_back(rtcmCrs);
 
@@ -2248 +2260 @@
     }
   }
+  helmertPar._msgType = _currMsg._type;
+  helmertPar._msgSize = int(_currMsg._size);
   _helmertPar.push_back(helmertPar);
 
@@ -2300 +2314 @@
       _typeList.back()._type = id;
       _typeList.back()._size = _BlockSize -6; /* header + crc */
+      _currMsg = _typeList.back();
 
       /* SSR I+II data handled in another function, already pass the

trunk/BNC/src/RTCM3/crs.h

@@ -19 +19 @@
     _coordinateEpoch = 0;
     _CE              = 0;
+    _msgType         = 0;
+    _msgSize         = 0;
   }
   ~t_serviceCrs() {
@@ -41 +43 @@
     double   _coordinateEpoch;
     double   _CE;
+    int      _msgType;   // RTCM message of the information (RTCM scan)
+    int      _msgSize;
   };
 
@@ -49 +53 @@
       _anchor = 0;
       _plateNumber = 0;
+      _msgType = 0;
+      _msgSize = 0;
     }
 
@@ -75 +81 @@
     int              _plateNumber;      // 0.. unknown, 7.. Eurasia
     QStringList      _databaseLinks;
+    int              _msgType;          // RTCM message of the information (RTCM scan)
+    int              _msgSize;
   };
 
@@ -97 +105 @@
        _sc  = 0.0;
        _scr = 0.0;
+       _msgType = 0;
+       _msgSize = 0;
      }
 
@@ -190 +200 @@
      double         _sc;  // scale
      double         _scr; // scale rate
+     int            _msgType; // RTCM message of the information (RTCM scan)
+     int            _msgSize;
    };