Changeset 1269 in ntrip

Timestamp:

Dec 2, 2008, 11:07:06 PM (16 years ago)

Author:

zdenek

Message:

* empty log message *

Location:

trunk/BNC/RTCM

Files:

• GPSDecoder.h (modified) (1 diff)
• RTCM2Decoder.cpp (modified) (1 diff)
• RTCM2Decoder.h (modified) (1 diff)
• RTCM2_2021.h (modified) (1 diff)

trunk/BNC/RTCM/GPSDecoder.h

@@ -158 +158 @@
   QList<int>       _typeList;  // RTCM   message types
   QList<int>       _epochList; // Broadcast corrections
-  QStringList      _antType;   // RTCMv3 antenna descriptor
+  QStringList      _antType;   // RTCM   antenna descriptor
   QList<t_antInfo> _antList;   // RTCM   antenna XYZ
 };

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -183 +183 @@
     }
 
+    else if ( _PP.ID() == 23 ) {
+      _msg23.extract(_PP);
+    }
+
+    else if ( _PP.ID() == 24 ) {
+      _msg24.extract(_PP);
+    }
+
     // Output for RTCM scan
-    if ( _PP.ID() == 3 ) {
-      _antList.push_back(t_antInfo());
-
-      this->getStaCrd(_antList.back().xx, _antList.back().yy, _antList.back().zz);
-
-      _antList.back().type     = t_antInfo::APC;
-      _antList.back().message  = _PP.ID();
+    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.back().message  = _PP.ID();
+      }
+    }
+    else if ( _PP.ID() == 23 ) {
+      if ( _msg23.validMsg ) {
+        _antType.push_back(_msg23.antType.c_str());
+      }
+    }
+    else if ( _PP.ID() == 24 ) {
+      if ( _msg24.validMsg ) {
+        _antList.push_back(t_antInfo());
+        
+        _antList.back().xx = _msg24.x;
+        _antList.back().yy = _msg24.y;
+        _antList.back().zz = _msg24.z;
+        
+        _antList.back().type     = t_antInfo::ARP;
+        _antList.back().message  = _PP.ID();
+      }
     }
   }

trunk/BNC/RTCM/RTCM2Decoder.h

@@ -133 +133 @@
     rtcm2::RTCM2_03           _msg03;
     rtcm2::RTCM2_22           _msg22;
+    rtcm2::RTCM2_23           _msg23;
+    rtcm2::RTCM2_24           _msg24;
     rtcm2::RTCM2_2021         _msg2021;
     std::map<std::string, t_ephList*> _ephList;

trunk/BNC/RTCM/RTCM2_2021.h

@@ -66 +66 @@
 class RTCM2_22 {
  public:
-  RTCM2_22() { }
+  RTCM2_22() { 
+    validMsg = false;
+  }
   
   void extract(const RTCM2packet& P);