Changeset 8200 in ntrip for branches/BNC_2.12/src/RTCM3

Timestamp:

Dec 11, 2017, 12:09:58 PM (7 years ago)

Author:

stuerze

Message:

receiver type extraction from 1033 RTCM3 messages is added

Location:

branches/BNC_2.12/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (4 diffs)
• RTCM3Decoder.h (modified) (1 diff)

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

@@ -1046 +1046 @@
     GETBITS(i, 5)
     eph._frequency_number = i - 7;
-    GLOFreq[sv - 1] = 100 + i - 7; /* store frequency for other users (MSM) */
-    _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(
-        eph._frequency_number, 2, 'f', 0);
     GETBITS(eph._almanac_health, 1) /* almanac healthy */
     GETBITS(eph._almanac_health_availablility_indicator, 1) /* almanac health ok */
@@ -1103 +1100 @@
     eph._xv(6) = eph._z_velocity * 1.e3;
 
+   GLOFreq[sv - 1] = 100 + eph._frequency_number ; /* store frequency for other users (MSM) */
+    _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frequency_number, 2, 'f', 0);
+    
     emit newGlonassEph(eph);
     decoded = true;
@@ -1381 +1381 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-bool RTCM3Decoder::DecodeAntenna(unsigned char* data, int size) {
-  char *antenna, type[256];
+bool RTCM3Decoder::DecodeAntennaReceiver(unsigned char* data, int size) {
+  char *antenna, anttype[256];
+  char *dummy;
+  char *receiver, rectype[256];
+
+  int type;
+
+  int dnum = -1;
   int antnum = -1;
+  int recnum = -1;
   uint64_t numbits = 0, bitfield = 0;
 
-  data += 4; /* header */
+  data += 3; /* header*/
   size -= 6; /* header + crc */
 
+  GETBITS(type, 12)
   SKIPBITS(12)
   GETSTRING(antnum, antenna)
   if (antnum > -1 && antnum < 265) {
-    memcpy(type, antenna, antnum);
-    type[antnum] = 0;
-    if (!_antType.contains(type)) {
-      _antType.push_back(type);
+    memcpy(anttype, antenna, antnum);
+    anttype[antnum] = 0;
+    if (!_antType.contains(anttype)) {
+      _antType.push_back(anttype);
+    }
+  }
+  if (type == 1033) {
+    SKIPBITS(8)
+    GETSTRING(dnum, dummy)
+    GETSTRING(recnum, receiver)
+    if (recnum > -1 && recnum < 265) {
+      memcpy(rectype, receiver, recnum);
+      rectype[recnum] = 0;
+      if (!_recType.contains(rectype)) {
+        _recType.push_back(rectype);
+      }
     }
   }
@@ -1526 +1546 @@
           case 1008:
           case 1033:
-            DecodeAntenna(_Message, _BlockSize);
+            DecodeAntennaReceiver(_Message, _BlockSize);
             break;
           case 1005:

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

@@ -146 +146 @@
   bool DecodeBDSEphemeris(unsigned char* buffer, int bufLen);
   /**
-   * Extract antenna type from 1007, 1008 or 1033 RTCM3 messages.
-   * @param buffer the buffer containing an antenna RTCM block
+   * Extract antenna type from 1007, 1008 or 1033 RTCM3 messages
+   * and extract receiver type from 1033 RTCM3 messages
+   * @param buffer the buffer containing an antenna (and receiver) RTCM block
    * @param bufLen the length of the buffer (the message length including header+crc)
    * @return <code>true</code> when data block was decodable
    */
-  bool DecodeAntenna(unsigned char* buffer, int bufLen);
+  bool DecodeAntennaReceiver(unsigned char* buffer, int bufLen);
   /**
    * Extract antenna type from 1005 or 1006 RTCM3 messages.