Changeset 7874 in ntrip for trunk/BNC/src

Timestamp:

Apr 18, 2016, 3:27:45 PM (9 years ago)

Author:

stuerze

Message:

minor changes regarding RTCM antenna type descriptor

Location:

trunk/BNC/src

Files:

• RTCM/RTCM2Decoder.cpp (modified) (1 diff)
• RTCM3/RTCM3Decoder.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM/RTCM2Decoder.cpp

@@ -211 +211 @@
       }
     } else if (_PP.ID() == 23) {
-      if (_msg23.validMsg) {
+      if (_msg23.validMsg && !_antType.contains(_msg23.antType.c_str())) {
         _antType.push_back(_msg23.antType.c_str());
       }

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1394 +1394 @@
 {
   char *antenna, type[256];
-  int antnum;
+  int antnum = -1;
   uint64_t numbits = 0, bitfield = 0;
 
@@ -1402 +1402 @@
   SKIPBITS(12)
   GETSTRING(antnum, antenna)
-  if (antnum < 265) {
+  if (antnum > -1 && antnum < 265) {
     memcpy(type, antenna, antnum);
     type[antnum] = 0;
-    _antType.push_back(type);
+    if (!_antType.contains(type)) {
+      _antType.push_back(type);
+    }
   }
   return true;