Changeset 8234 in ntrip for trunk/BNC

Timestamp:

Jan 5, 2018, 10:52:16 AM (7 years ago)

Author:

stuerze

Message:

antenna and receiver info from message type 1007, 1008 and 1033 completed

Location:

trunk/BNC/src

Files:

• RTCM/RTCM2Decoder.cpp (modified) (2 diffs)
• RTCM/RTCM2Decoder.h (modified) (2 diffs)
• RTCM3/RTCM3Decoder.cpp (modified) (3 diffs)

trunk/BNC/src/RTCM/RTCM2Decoder.cpp

@@ -202 +202 @@
     if (_PP.ID() == 3) {
       if (_msg03.validMsg) {
-        _antList.push_back(t_antInfo());
-
-        this->getStaCrd(_antList.back().xx, _antList.back().yy,
-            _antList.back().zz);
-
-        _antList.back().type = t_antInfo::APC;
+        _antList.push_back(t_antRefPoint());
+
+        this->getStaCrd(_antList.back().xx, _antList.back().yy, _antList.back().zz);
+
+        _antList.back().type = t_antRefPoint::APC;
         _antList.back().message = _PP.ID();
       }
     } else if (_PP.ID() == 23) {
-      if (_msg23.validMsg && !_antType.contains(_msg23.antType.c_str())) {
-        _antType.push_back(_msg23.antType.c_str());
+      if (_msg23.validMsg) {
+        int antlen = strlen(_msg23.antType.c_str());
+        int serlen = strlen(_msg23.antSN.c_str());
+        if ((antlen) &&
+            (_antType.empty() || strncmp(_antType.back().descriptor, _msg23.antType.c_str(), antlen) != 0)) {
+          _antType.push_back(t_antInfo());
+          memcpy(_antType.back().descriptor, _msg23.antType.c_str(), antlen);
+          _antType.back().descriptor[antlen] = 0;
+          if (serlen) {
+            memcpy(_antType.back().serialnumber,  _msg23.antSN.c_str(), serlen);
+            _antType.back().serialnumber[serlen] = 0;
+          }
+        }
       }
     } else if (_PP.ID() == 24) {
       if (_msg24.validMsg) {
-        _antList.push_back(t_antInfo());
+        _antList.push_back(t_antRefPoint());
 
         _antList.back().xx = _msg24.x;
@@ -225 +235 @@
         _antList.back().height = _msg24.h;
 
-        _antList.back().type = t_antInfo::ARP;
+        _antList.back().type = t_antRefPoint::ARP;
         _antList.back().message = _PP.ID();
       }

trunk/BNC/src/RTCM/RTCM2Decoder.h

@@ -29 +29 @@
 #include <vector>
 #include <list>
+#include <stdio.h>
 
 #include "GPSDecoder.h"
@@ -71 +72 @@
     rtcm2::RTCM2_24    _msg24;
     rtcm2::RTCM2_2021  _msg2021;
-    bncEphUser         _ephUser;        
+    bncEphUser         _ephUser;
 };
 

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1382 +1382 @@
 ////////////////////////////////////////////////////////////////////////////
 bool RTCM3Decoder::DecodeAntennaReceiver(unsigned char* data, int size) {
-  char *antenna, anttype[256];
-  char *dummy;
-  char *receiver, rectype[256];
-
+  char *antenna;
+  char *antserialnum;
+  char *receiver;
+  char *recfirmware;
+  char *recserialnum;
   int type;
-
-  int dnum = -1;
+  int antsernum = -1;
   int antnum = -1;
   int recnum = -1;
+  int recsernum = -1;
+  int recfirnum = -1;
   uint64_t numbits = 0, bitfield = 0;
 
@@ -1397 +1399 @@
 
   GETBITS(type, 12)
-  SKIPBITS(12)
+  SKIPBITS(12) /* reference station ID */
   GETSTRING(antnum, antenna)
-  if (antnum > -1 && antnum < 265) {
-    memcpy(anttype, antenna, antnum);
-    anttype[antnum] = 0;
-    if (!_antType.contains(anttype)) {
-      _antType.push_back(anttype);
+  if ((antnum > -1 && antnum < 265) &&
+      (_antType.empty() || strncmp(_antType.back().descriptor, antenna, recnum) != 0)) {
+    _antType.push_back(t_antInfo());
+    memcpy(_antType.back().descriptor, antenna, antnum);
+    _antType.back().descriptor[antnum] = 0;
+  }
+  SKIPBITS(8) /* antenna setup ID */
+  if (type == 1008 || type == 1033 ) {
+    GETSTRING(antsernum, antserialnum)
+    if ((antsernum > -1 && antsernum < 265)) {
+      memcpy(_antType.back().serialnumber, antserialnum, antsernum);
+      _antType.back().serialnumber[antsernum] = 0;
     }
   }
+
   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);
+    GETSTRING(recfirnum, recfirmware)
+    GETSTRING(recsernum, recserialnum)
+    if ((recnum > -1 && recnum < 265) &&
+        (_recType.empty() || strncmp(_recType.back().descriptor, receiver, recnum) != 0)) {
+      _recType.push_back(t_recInfo());
+      memcpy(_recType.back().descriptor, receiver, recnum);
+      _recType.back().descriptor[recnum] = 0;
+      if (recfirnum > -1 && recfirnum < 265) {
+        memcpy(_recType.back().firmware, recfirmware, recfirnum);
+        _recType.back().firmware[recfirnum] = 0;
+      }
+      if (recsernum > -1 && recsernum < 265) {
+        memcpy(_recType.back().serialnumber, recserialnum, recsernum);
+        _recType.back().serialnumber[recsernum] = 0;
       }
     }
@@ -1432 +1449 @@
 
   GETBITS(type, 12)
-  _antList.push_back(t_antInfo());
-  _antList.back().type = t_antInfo::ARP;
+  _antList.push_back(t_antRefPoint());
+  _antList.back().type = t_antRefPoint::ARP;
   SKIPBITS(22)
   GETBITSSIGN(x, 38)