Changeset 9286 in ntrip for branches

Timestamp:

Nov 26, 2020, 10:02:59 PM (3 years ago)

Author:

stuerze

Message:

minor changes

Location:

branches/BNC_2.12/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (8 diffs)
• RTCM3/RTCM3Decoder.h (modified) (4 diffs)
• bncgetthread.cpp (modified) (1 diff)

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

@@ -1032 +1032 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-    eph._receptStaID = _staID;    
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1111 +1111 @@
     eph._receptDateTime = currentDateAndTimeGPS();
     eph._receptStaID = _staID;
-    
+
     GETBITS(sv, 6)
     eph._prn.set('R', sv);
@@ -1236 +1236 @@
     eph._receptDateTime = currentDateAndTimeGPS();
     eph._receptStaID = _staID;
-    
+
     GETBITS(i, 4)
     eph._prn.set('J', i);
@@ -1319 +1319 @@
     eph._receptDateTime = currentDateAndTimeGPS();
     eph._receptStaID = _staID;
-    
+
     GETBITS(i, 6)
     eph._prn.set('I', i);
@@ -1410 +1410 @@
     eph._receptDateTime = currentDateAndTimeGPS();
     eph._receptStaID = _staID;
-    
+
     GETBITS(i, 6)
     eph._prn.set('S', 20 + i);
@@ -1465 +1465 @@
     eph._receptDateTime = currentDateAndTimeGPS();
     eph._receptStaID = _staID;
-    
+
     eph._inav = (i == 1046);
     eph._fnav = (i == 1045);
@@ -1571 +1571 @@
     eph._receptDateTime = currentDateAndTimeGPS();
     eph._receptStaID = _staID;
-    
+
     GETBITS(i, 6)
     eph._prn.set('C', i);
@@ -1745 +1745 @@
         }
       }
-     else if (id >= 1070 && id <= 1229) { /* MSM */
+     else if (id >= 1070 && id <= 1237) { /* MSM */
         if (DecodeRTCM3MSM(_Message, _BlockSize))
           decoded = true;

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

@@ -64 +64 @@
    * {@link _MessageSize}: contains to current amount of bytes in the buffer<br>
    * {@link _SkipBytes}: amount of bytes to skip at the beginning of the buffer
-   * 
+   *
    * The functions sets following variables:<br>
    * {@link _NeedBytes}: Minimum number of bytes needed on next call<br>
@@ -94 +94 @@
   bool DecodeRTCM3GLONASS(unsigned char* buffer, int bufLen);
   /**
-   * Extract data from MSM 1070-1229 RTCM3 messages.
-   * @param buffer the buffer containing an 1070-1229 RTCM block
+   * Extract data from MSM 1070-1237 RTCM3 messages.
+   * @param buffer the buffer containing an 1070-1237 RTCM block
    * @param bufLen the length of the buffer (the message length including header+crc)
    * @return <code>true</code> when data block is finished and transfered into
@@ -137 +137 @@
    * @return <code>true</code> when data block was decodable
    */
-  bool DecodeIRNSSEphemeris(unsigned char* buffer, int bufLen);  
+  bool DecodeIRNSSEphemeris(unsigned char* buffer, int bufLen);
   /**
    * Extract ephemeris data from 1045 and 1046 RTCM3 messages.
@@ -174 +174 @@
 
   /** List of decoders for Clock and Orbit data */
-  QMap<QByteArray, RTCM3coDecoder*> _coDecoders; 
+  QMap<QByteArray, RTCM3coDecoder*> _coDecoders;
 
   /** Message buffer for input parsing */

branches/BNC_2.12/src/bncgetthread.cpp

@@ -558 +558 @@
           if ((rtcmType >= 1001 && rtcmType <= 1004) || // legacy RTCM OBS
               (rtcmType >= 1009 && rtcmType <= 1012) || // legacy RTCM OBS
-              (rtcmType >= 1071 && rtcmType <= 1137)) { // MSM RTCM OBS
+              (rtcmType >= 1070 && rtcmType <= 1137)) { // MSM RTCM OBS
             _rtcmObs = true;
           } else if ((rtcmType >= 1057 && rtcmType <= 1068) ||