Changeset 9036 in ntrip for branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

Timestamp:

Aug 27, 2020, 9:36:18 AM (4 years ago)

Author:

stuerze

Message:

some modification to allow encoding and decoding of SSR corrections in RTCM-SSR and IGS-SSR formats

File:

• branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp (modified) (9 diffs)

branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

@@ -489 +489 @@
 
   bncTime CurrentObsTime;
-  if (sys == 'C') /* BDS */ {
+  if      (sys == 'C') /* BDS */ {
     GETBITS(i, 30)
     CurrentObsTime.setBDS(i);
@@ -793 +793 @@
                   frqObs->_codeValid = true;
                 }
-
                 if (cp[count] > -1.0 / (1 << 8)) {
                   frqObs->_phase = cp[count] * LIGHTSPEED / 1000.0 / cd.wl
@@ -802 +801 @@
                   frqObs->_slipCounter = ll[count];
                 }
-
                 frqObs->_snr = cnr[count];
                 frqObs->_snrValid = true;
@@ -812 +810 @@
                   frqObs->_codeValid = true;
                 }
-
                 if (cp[count] > -1.0 / (1 << 8)) {
                   frqObs->_phase = cp[count] * LIGHTSPEED / 1000.0 / cd.wl
@@ -821 +818 @@
                   frqObs->_slipCounter = ll[count];
                 }
-
                 frqObs->_snr = cnr[count];
                 frqObs->_snrValid = true;
-
                 if (dop[count] > -1.6384) {
                   frqObs->_doppler = -(dop[count] + rdop[numsat]) / cd.wl;
@@ -836 +831 @@
                   frqObs->_codeValid = true;
                 }
-
                 if (cp[count] > -1.0 / (1 << 8)) {
                   frqObs->_phase = cp[count] * LIGHTSPEED / 1000.0 / cd.wl
@@ -855 +849 @@
                   frqObs->_codeValid = true;
                 }
-
                 if (cp[count] > -1.0 / (1 << 8)) {
                   frqObs->_phase = cp[count] * LIGHTSPEED / 1000.0 / cd.wl
@@ -1624 +1617 @@
        * else. */
       if ((id >= 1057 && id <= 1068) ||
-          (id >= 1240 && id <= 1270) ||
-          (id == 4076)) {
-        if (!_coDecoders.contains(_staID.toAscii()))
-          _coDecoders[_staID.toAscii()] = new RTCM3coDecoder(_staID);
-        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toAscii()];
+          (id >= 1240 && id <= 1270) ||
+                  (id == 4076)) {
+        RTCM3coDecoder::e_type type = RTCM3coDecoder::e_type::RTCMssr;
+        if (id == 4076) {
+          type = RTCM3coDecoder::e_type::IGSssr;
+        }
+        if (!_coDecoders.contains(_staID.toLatin1()))
+          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID, type);
+        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
         if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
             errmsg) == success) {
@@ -1716 +1713 @@
   while (size--) {
     crc ^= (*buf++) << (16);
-    for (i = 0; i < 8; i++)
-        {
+    for (i = 0; i < 8; i++) {
       crc <<= 1;
       if (crc & 0x1000000)