Changeset 1185 in ntrip

Timestamp:

Nov 10, 2008, 7:08:54 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (2 diffs)
• rtcm3torinex.h (modified) (2 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -217 +217 @@
 
       if (_Parser.MessageSize >= _Parser.NeedBytes) {
-    
-        // RTCM message types
-        // ------------------
+
+        // RTCMv3 message types
+        // --------------------
         for (int kk = 0; kk < _Parser.typeSize; kk++) {
           _typeList.push_back(_Parser.typeList[kk]);
@@ -225 +225 @@
         _Parser.typeSize = 0;
 
-        // Antenna XYZ-H
-        // -------------
-        for (int kk = 0; kk < _Parser.antSize; kk += 4) {
-          _antList.push_back(_Parser.antList[kk + 0]);
-          _antList.push_back(_Parser.antList[kk + 1]);
-          _antList.push_back(_Parser.antList[kk + 2]);
-          _antList.push_back(_Parser.antList[kk + 3]);
+        // RTCMv3 antenna descriptor
+        // -------------------------
+        for (int kk = 0; kk < _Parser.antSize; kk++) {
+          _antType.push_back(_Parser.antType[kk]);
         }
         _Parser.antSize = 0;
-    
+
+        // RTCMv3 antenna XYZ
+        // ------------------
+        for (int kk = 0; kk < _Parser.antSize5; kk += 3) {
+          _antList5.push_back(_Parser.antList5[kk + 0]);
+          _antList5.push_back(_Parser.antList5[kk + 1]);
+          _antList5.push_back(_Parser.antList5[kk + 2]);
+        }
+        _Parser.antSize5 = 0;
+
+        // RTCMv3 antenna XYZ-H
+        // --------------------
+        for (int kk = 0; kk < _Parser.antSize6; kk += 4) {
+          _antList6.push_back(_Parser.antList6[kk + 0]);
+          _antList6.push_back(_Parser.antList6[kk + 1]);
+          _antList6.push_back(_Parser.antList6[kk + 2]);
+          _antList6.push_back(_Parser.antList6[kk + 3]);
+        }
+        _Parser.antSize6 = 0;
+ 
         while(int rr = RTCM3Parser(&_Parser)) {
 

trunk/BNC/RTCM3/rtcm3torinex.h

@@ -4 +4 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.12 2008/09/02 14:14:40 weber Exp $
+  $Id: rtcm3torinex.h,v 1.13 2008/09/22 09:39:58 weber Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -195 +195 @@
   int    lastlockl2[64];
 #ifdef NO_RTCM3_MAIN
-  int    typeSize;       /* RTCM message types */
-  int    typeList[101];  /* RTCM message types */
-  int    antSize;       /* Antenna XYZ-H */
-  double antList[101];  /* Antenna XYZ-H */
+  int    typeSize;       /* Message types */
+  int    typeList[101];  /* Message types */
+  int    antSize;        /* Antenna descriptor */
+  char   *antType[101];  /* Antenna descriptor */
+  int    antSize5;       /* Antenna XYZ */
+  double antList5[101];  /* Antenna XYZ */
+  int    antSize6;       /* Antenna XYZ-H */
+  double antList6[101];  /* Antenna XYZ-H */
 #endif /* NO_RTCM3_MAIN */
   int    datapos[RINEXENTRY_NUMBER];