Changeset 1130 in ntrip for trunk

Timestamp:

Sep 22, 2008, 11:39:58 AM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/GPSDecoder.h (modified) (1 diff)
• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• RTCM3/rtcm3torinex.c (modified) (4 diffs)
• RTCM3/rtcm3torinex.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bnchelp.html (modified) (1 diff)
• bncwindow.cpp (modified) (3 diffs)

trunk/BNC/RTCM/GPSDecoder.h

@@ -135 +135 @@
   QList<p_obs> _obsList;
   QList<int> _typeList; // RTCM message types
-  QList<int> _epochList; // RTCM message types
+  QList<int> _epochList; // Broadcast corrections
+  QList<double> _antList; // Antenna XYZ-H
 };
 

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -227 +227 @@
         }
         _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]);
+        }
+        _Parser.antSize = 0;
     
         while(int rr = RTCM3Parser(&_Parser)) {

trunk/BNC/RTCM3/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.32 2008/09/02 07:45:48 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.16 2008/09/02 14:14:33 weber Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -51 +51 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.32 $";
+static char revisionstr[] = "$Revision: 1.16 $";
 
 #ifndef COMPILEDATE
@@ -289 +289 @@
     switch(type)
     {
+#ifdef NO_RTCM3_MAIN
+    double antX, antY, antZ, antH; /* Antenna XYZ-H */
+    case 1006:
+      {
+        SKIPBITS(22);
+        GETBITSSIGN(antX, 38); SKIPBITS(2);
+        GETBITSSIGN(antY, 38); SKIPBITS(2);
+        GETBITSSIGN(antZ, 38);
+        GETBITS(    antH, 16);
+        handle->antList[handle->antSize + 0] = antX;
+        handle->antList[handle->antSize + 1] = antY;
+        handle->antList[handle->antSize + 2] = antZ;
+        handle->antList[handle->antSize + 3] = antH;
+        if(handle->antSize < 100 - 6 ) {handle->antSize += 4;}
+      }
+      break;
+#endif /* NO_RTCM3_MAIN */
     case 1019:
       {
@@ -1622 +1639 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2008/09/02 07:45:48 $";
+static char datestr[]     = "$Date: 2008/09/02 14:14:33 $";
 
 /* The string, which is send as agent in HTTP request */

trunk/BNC/RTCM3/rtcm3torinex.h

@@ -4 +4 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.8 2008/09/02 07:45:48 stoecker Exp $
+  $Id: rtcm3torinex.h,v 1.12 2008/09/02 14:14:40 weber Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -197 +197 @@
   int    typeSize;       /* RTCM message types */
   int    typeList[101];  /* RTCM message types */
+  int    antSize;       /* Antenna XYZ-H */
+  double antList[101];  /* Antenna XYZ-H */
 #endif /* NO_RTCM3_MAIN */
   int    datapos[RINEXENTRY_NUMBER];

trunk/BNC/bncgetthread.cpp

@@ -687 +687 @@
         _decoder->_obsList.clear();
 
-        // RTCM message types
-        // ------------------
         if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
+
+          // RTCM message types
+          // ------------------
           if (0<_decoder->_typeList.size()) {
             QString type;
             for (int ii=0;ii<_decoder->_typeList.size();ii++) {
               type =  QString("%1 ").arg(_decoder->_typeList[ii]);
-              if (type != "") {
-                emit(newMessage(_staID + ": Received message type " + type.toAscii() ));
-              }
+              emit(newMessage(_staID + ": Received message type " + type.toAscii() ));
             }
           }
-        }
-        _decoder->_typeList.clear();
+          _decoder->_typeList.clear();
+
+          // Antenna XYZ & H
+          // ---------------
+          if (0<_decoder->_antList.size()) {
+            QString ant1,ant2,ant3,ant4;
+            for (int ii=0;ii<_decoder->_antList.size();ii+=4) {
+              ant1 =  QString("%1 ").arg(_decoder->_antList[ii+0]*0.0001,0,'f',4);
+              ant2 =  QString("%1 ").arg(_decoder->_antList[ii+1]*0.0001,0,'f',4);
+              ant3 =  QString("%1 ").arg(_decoder->_antList[ii+2]*0.0001,0,'f',4);
+              ant4 =  QString("%1 ").arg(_decoder->_antList[ii+3]*0.0001,0,'f',4);
+              emit(newMessage(_staID + ": ARP (ITRF) X " + ant1.toAscii() + "m" ));
+              emit(newMessage(_staID + ": ARP (ITRF) Y " + ant2.toAscii() + "m"));
+              emit(newMessage(_staID + ": ARP (ITRF) Z " + ant3.toAscii() + "m"));
+              emit(newMessage(_staID + ": Antenna height "  + ant4.toAscii() + "m"));
+            }
+          }
+          _decoder->_antList.clear();
+        }
       }
 

trunk/BNC/bnchelp.html

@@ -581 +581 @@
 <p><a name="messtypes"><h4>3.10. RTCM Scan</h4></p>
 <p>
-When configuring a GNSS receiver for RTCM stream generation, the setup interface may not provide details about RTCM message types. As reliable information concerning stream contents should be available i.e. for NTRIP broadcaster operators to maintain the broadcaster's sourcetable, BNC allows to scan RTCM Version 3.x streams for incoming message types and their repetition rates. The idea for this option arose from 'InspectRTCM', a comprehensive stream analyzing tool written by D. Stoecker.
+When configuring a GNSS receiver for RTCM stream generation, the setup interface may not provide details about RTCM message types. As reliable information concerning stream contents should be available i.e. for NTRIP broadcaster operators to maintain the broadcaster's sourcetable, BNC allows to scan RTCM Version 3.x streams for incoming message types and printout some of the contained meta-data. The idea for this option arose from 'InspectRTCM', a comprehensive stream analyzing tool written by D. Stoecker.
 </p>
 

trunk/BNC/bncwindow.cpp

@@ -329 +329 @@
   _ephV3CheckBox->setWhatsThis(tr("The default format for RINEX Navigation files containing Broadcast Ephemeris is RINEX Version 2.11. Select 'Version 3' if you want to save the ephemeris in RINEX Version 3 format."));
   _rnxV3CheckBox->setWhatsThis(tr("The default format for RINEX Observation files is RINEX Version 2.11. Select 'Version 3' if you want to save the observations in RINEX Version 3 format."));
-  _messTypesLineEdit->setWhatsThis(tr("<p>Specify the mountpoint of an RTCM Version 3.x stream to log the numbers of incoming message types.</p><p>An empty option field (default) means that you don't want BNC to print the message type numbers carried in a specific stream.</p>"));
+  _messTypesLineEdit->setWhatsThis(tr("<p>Specify the mountpoint of an RTCM Version 3.x stream to log the numbers of incoming message types as well as contained antenna coordinates and antenna hight.</p><p>An empty option field (default) means that you don't want BNC to log such information.</p>"));
 
   // Canvas with Editable Fields
@@ -352 +352 @@
   aogroup->addTab(cgroup,tr("Ephemeris Corrections"));
   aogroup->addTab(agroup,tr("Monitor"));
-  aogroup->addTab(rgroup,tr("RTCM Message Types"));
+  aogroup->addTab(rgroup,tr("RTCM Scan"));
 
   QGridLayout* pLayout = new QGridLayout;
@@ -428 +428 @@
   rLayout->addWidget(new QLabel("Mountpoint"),0,0, Qt::AlignLeft);
   rLayout->addWidget(_messTypesLineEdit,0,1,1,15,Qt::AlignLeft);
-  rLayout->addWidget(new QLabel("Log numbers of message types in RTCM Version 3.x stream."),1, 0, 1, 4, Qt::AlignLeft);
+  rLayout->addWidget(new QLabel("Scan RTCM Version 3.x stream to log numbers of message types and antenna information."),1, 0, 1, 4, Qt::AlignLeft);
   rLayout->addWidget(new QLabel("    "),2,0);
   rLayout->addWidget(new QLabel("    "),3,0);