Changeset 1030 in ntrip for trunk/BNC

Timestamp:

Aug 10, 2008, 1:58:23 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)
• bncabout.html (modified) (1 diff)
• bncgetthread.cpp (modified) (2 diffs)
• bncgetthread.h (modified) (1 diff)
• bnchelp.html (modified) (6 diffs)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (6 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/RTCM/GPSDecoder.h

@@ -102 +102 @@
 
   QList<p_obs> _obsList;
+  QList<int> _typeList; // RTCM message types
 };
 

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -124 +124 @@
     
         while(int rr = RTCM3Parser(&_Parser)) {
+
+        // RTCM message types
+        // ------------------
+          for (int kk = 0; kk < _Parser.typeSize; kk++) {
+            _typeList.push_back(_Parser.typeList[kk]);
+          }
+          _Parser.typeSize = 0;
     
           // GNSS Observations

trunk/BNC/RTCM3/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.29 2008/07/22 15:15:51 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.12 2008/08/01 14:03:28 mervart Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -51 +51 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.29 $";
+static char revisionstr[] = "$Revision: 1.12 $";
 
 #ifndef COMPILEDATE
@@ -283 +283 @@
 
     GETBITS(type,12)
+    handle->typeList[handle->typeSize] = type;           /* RTCM message types */
+    if(handle->typeSize < 100) {handle->typeSize += 1;}  /* RTCM message types */
     switch(type)
     {
@@ -1532 +1534 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2008/07/22 15:15:51 $";
+static char datestr[]     = "$Date: 2008/08/01 14:03:28 $";
 
 /* 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.9 2007/10/17 06:12:00 mervart Exp $
+  $Id: rtcm3torinex.h,v 1.10 2008/01/29 14:53:15 mervart Exp $
   Copyright (C) 2005-2006 by Dirk Stoecker <stoecker@alberding.eu>
 
@@ -196 +196 @@
   int    lastlockl1[64];
   int    lastlockl2[64];
+  int    typeSize;       /* RTCM message types */
+  int    typeList[101];  /* RTCM message types */
   int    datapos[RINEXENTRY_NUMBER];
   int    dataflag[RINEXENTRY_NUMBER];

trunk/BNC/bncabout.html

@@ -21 +21 @@
 The Bundesamt fuer Geodaesie und Kartographie (BKG) may not be held liable for damages of any kind, direct or consequential, which may result from the use of this software.<br>
 <br>
-BKG, Frankfurt, Germany, April 2008<br>
+BKG, Frankfurt, Germany, August 2008<br>
 E-Mail: <a><u>euref-ip@bkg.bund.de</u></a>.<br>
 </p>

trunk/BNC/bncgetthread.cpp

@@ -130 +130 @@
   if ( settings.value("perfIntr").toString().indexOf("6 hours") != -1 ) { _perfIntr = 21600; }
   if ( settings.value("perfIntr").toString().indexOf("1 day") != -1 ) { _perfIntr = 86400; }
+
+  // RTCM message types
+  // ------------------
+  _checkMountPoint = settings.value("messTypes").toString();
 
   // RINEX writer
@@ -658 +662 @@
         }
         _decoder->_obsList.clear();
-      }
+
+        // RTCM message types
+        // ------------------
+        if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
+          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() ));              }
+            }
+          }
+        }
+        _decoder->_typeList.clear();
+      }
+
+      // Timeout, reconnect
+      // ------------------
       else {
         emit(newMessage(_staID + ": Data Timeout, reconnecting"));

trunk/BNC/bncgetthread.h

@@ -84 +84 @@
    QString     _endDateOut;
    QString     _endTimeOut;
+   QString     _checkMountPoint;
    bool        _makePause;
    int         _obsRate;

trunk/BNC/bnchelp.html

@@ -101 +101 @@
 &nbsp; &nbsp; &nbsp; 3.9.5. <a href=#advscript>Advisory Script</a><br>
 &nbsp; &nbsp; &nbsp; 3.9.6. <a href=#perflog>Performance Log</a><br>
-3.10. <a href=#mountpoints>Mountpoints</a><br>
-&nbsp; &nbsp; &nbsp; 3.10.1. <a href=#mountadd>Add Mountpoints</a><br>
-&nbsp; &nbsp; &nbsp; 3.10.2. <a href=#mounthost>Broadcaster Host and Port</a><br>
-&nbsp; &nbsp; &nbsp; 3.10.3. <a href=#mountuser>Broadcaster User and Password</a><br>
-&nbsp; &nbsp; &nbsp; 3.10.4. <a href=#mounttable>Get Table</a><br>
-&nbsp; &nbsp; &nbsp; 3.10.5. <a href=#mountdelete>Delete Mountpoints</a><br>
-&nbsp; &nbsp; &nbsp; 3.10.6. <a href=#mountedit>Edit Mountpoints</a><br>
-3.11. <a href=#start>Start</a><br>
-3.12. <a href=#stop>Stop</a><br>
-3.13. <a href=#nw>No Window</a>
+3.10. <a href=#messtypes>RTCM Message Types</a><br>
+&nbsp; &nbsp; &nbsp; 3.10.1. <a href=#messmount>Mountpoint</a><br>
+3.11. <a href=#mountpoints>Mountpoints</a><br>
+&nbsp; &nbsp; &nbsp; 3.11.1. <a href=#mountadd>Add Mountpoints</a><br>
+&nbsp; &nbsp; &nbsp; 3.11.2. <a href=#mounthost>Broadcaster Host and Port</a><br>
+&nbsp; &nbsp; &nbsp; 3.11.3. <a href=#mountuser>Broadcaster User and Password</a><br>
+&nbsp; &nbsp; &nbsp; 3.11.4. <a href=#mounttable>Get Table</a><br>
+&nbsp; &nbsp; &nbsp; 3.11.5. <a href=#mountdelete>Delete Mountpoints</a><br>
+&nbsp; &nbsp; &nbsp; 3.11.6. <a href=#mountedit>Edit Mountpoints</a><br>
+3.12. <a href=#start>Start</a><br>
+3.13. <a href=#stop>Stop</a><br>
+3.14. <a href=#nw>No Window</a>
 </p>
 
@@ -573 +575 @@
 </p>
 
-<p><a name="mountpoints"><h4>3.10. Mountpoints</h4></p>
+<p><a name="messtypes"><h4>3.10. RTCM Message Types</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 check RTCM Version 3.x streams for incoming message types and their repetition rates.  
+</p>
+
+<p><a name="messmount"><h4>3.10.1 Mountpoint - optional</h4></p>
+<p>
+Specify the mountpoint of an RTCM Version 3.x stream to log the numbers of incoming message types. Logged time stamps refer to message reception time and allow to understand repetition rates. Enter 'ALL' if you want to log message type numbers of all configured streams. Beware that the size of the logfile can rapidly increase depending on the number of incoming RTCM Version 3.x streams.
+</p>
+<p>This option is primarily meant for testing and evaluation. An empty option field (default) means that you don't want BNC to print the message type numbers carried in RTCM Version 3.x streams.
+</p>
+
+<p><a name="mountpoints"><h4>3.11. Mountpoints</h4></p>
 <p>
 Each stream on an NTRIP broadcaster is defined using a unique source ID called mountpoint. An NTRIP client like BNC access the desired data stream by referring to its mountpoint. Information about mountpoints is available through the source-table maintained by the NTRIP broadcaster. Note that mountpoints could show up in BNC more than once when retrieving streams from several NTRIP broadcasters.
@@ -590 +604 @@
 </table>
 
-<p><a name="mountadd"><h4>3.10.1 Add Mountpoints</h4></p>
+<p><a name="mountadd"><h4>3.11.1 Add Mountpoints</h4></p>
 <p>
 Button 'Add Mountpoints' opens a window that allows user to select data streams from an NTRIP broadcaster according to their mountpoints.
 </p> 
 
-<p><a name="mounthost"><h4>3.10.2 Broadcaster Host and Port - required</h4></p>
+<p><a name="mounthost"><h4>3.11.2 Broadcaster Host and Port - required</h4></p>
 <p>
 Enter the NTRIP broadcaster host IP and port number. <u>http://www.rtcm-ntrip.org/home</u> provides information about known NTRIP broadcaster installations. Note that EUREF and IGS operate NTRIP broadcasters at <u>http://www.euref-ip.net/home</u> and <u>http://www.igs-ip.net/home</u>.
 </p> 
 
-<p><a name="mountuser"><h4>3.10.3 Broadcaster User and Password - required for protected streams</h4></p>
+<p><a name="mountuser"><h4>3.11.3 Broadcaster User and Password - required for protected streams</h4></p>
 <p>
 Some streams on NTRIP broadcasters may be restricted. Enter a valid 'User' ID and 'Password' for access to protected streams. Accounts are usually provided per NTRIP broadcaster through a registration procedure. Register through <u>http://igs.bkg.bund.de/index_ntrip_reg.htm</u> for access to protected streams on <u>www.euref-ip.net</u> and <u>www.igs-ip.net</u>.
 </p> 
 
-<p><a name="mounttable"><h4>3.10.4 Get Table</h4></p>
+<p><a name="mounttable"><h4>3.11.4 Get Table</h4></p>
 <p>
 Use the 'Get Table' button to download the source-table from the NTRIP broadcaster. Pay attention to data fields 'format' and 'format-details'. Keep in mind that BNC can only decode and convert streams that come in RTCM Version 2.x, RTCM Version 3.x, or RTIGS format. RTCM Version 2.x streams must contain message types 18 and 19 while RTCM Version 3.x streams must contain GPS or SBAS message types 1002 or 1004 and may contain GLONASS message types 1010 or 1012, see data field 'format-details' for available message types and their repetition rates in brackets. Note that in order to produce RINEX Navigation files RTCM Version 3.x streams containing message types 1019 (GPS) and 1020 (GLONASS) are required. Select your streams line by line, use +Shift and +Ctrl when necessary.
@@ -616 +630 @@
 </p> 
 
-<p><a name="mountdelete"><h4>3.10.5 Delete Mountpoints</h4></p>
+<p><a name="mountdelete"><h4>3.11.5 Delete Mountpoints</h4></p>
 <p>
 To remove a stream from the 'Mountpoints' list in the main window, highlight it by clicking on it and hit the 'Delete Mountpoints' button. You can also remove multiple mountpoints simultaneously by highlighting them using +Shift and +Ctrl.</p>
 
-<p><a name="mountedit"><h4>3.10.6 Edit Mountpoints</h4></p>
+<p><a name="mountedit"><h4>3.11.6 Edit Mountpoints</h4></p>
 <ul>
 <li>
@@ -635 +649 @@
 </ul> 
 
-<p><a name="start"><h4>3.11. Start</h4></p>
+<p><a name="start"><h4>3.12. Start</h4></p>
 <p>
 Hit 'Start' to start retrieving, decoding, and converting GNSS data streams in real-time. Note that 'Start' generally forces BNC to begin with fresh RINEX which might overwrite existing files when necessary unless the option 'Append files' is ticked.
 </p> 
 
-<p><a name="stop"><h4>3.12. Stop</h4></p>
+<p><a name="stop"><h4>3.13. Stop</h4></p>
 <p>
 Hit the 'Stop' button in order to stop BNC. 
 </p> 
 
-<p><a name="nw"><h4>3.13. No Window - optional</h4></p>
+<p><a name="nw"><h4>3.14. No Window - optional</h4></p>
 <p>
 On all systems BNC can be started in batch mode with the command line option '-nw'. BNC will then run in 'no window' mode, using options from the configuration file ${HOME}/.config/BKG/BNC_NTRIP_Client.conf (Unix/Linux, see Config File example in the Annex) or from the register BKG_NTRIP_Client (Windows).
@@ -731 +745 @@
 <tr><td>Jul 2007 &nbsp;</td><td>Version 1.4 &nbsp;</td><td>[Bug] Skip messages from proxy server<br> [Bug] Call RINEX script through 'nohup'</td></tr>
 <tr><td>Apr 2008 &nbsp;</td><td>Version 1.5 &nbsp;</td><td>[Add] Handle ephemeris from RTCM Version 3.x streams<br> [Add] Upgrade to Qt Version 4.3.2<br> [Add] Optional RINEX v3 output<br> [Add] SBAS support<br> [Bug] RINEX skeleton download following stream outage<br> [Add] Handle ephemeris from RTIGS streams<br> [Add] Monitor stream failure/recovery and latency<br> [Mod] Redesign of main window<br> [Bug] Freezing of About window on Mac systems<br> [Bug] Fixed problem with PRN 32 in RTCMv2 decoder<br> [Bug] Fix for Trimble 4000SSI receivers in RTCMv2 decoder<br> [Mod] Major revision of input buffer in RTCMv2 decoder</td></tr>
-<tr><td>May 2008 &nbsp;</td><td>Version 1.6 &nbsp;</td><td>[Mod] Fill blanc columns in RINEXv3 with 0.000</td></tr>
+<tr><td>August 2008 &nbsp;</td><td>Version 1.6 &nbsp;</td><td>[Mod] Fill blanc columns in RINEXv3 with 0.000<br> [Add] RTCM v3 decoder for clock&orbit corrections<br>[Add] Check RTCM v3 streams for incoming message types</td></tr>
 </table>
 </p>

trunk/BNC/bncmain.cpp

@@ -88 +88 @@
     settings.setValue("perfIntr",   "");
     settings.setValue("waitCorr",   0);
+    settings.setValue("messTypes",   "");
   }
 

trunk/BNC/bncwindow.cpp

@@ -108 +108 @@
   _proxyPortLineEdit  = new QLineEdit(settings.value("proxyPort").toString());
   _proxyPortLineEdit->setMaximumWidth(9*ww);
+  _messTypesLineEdit  = new QLineEdit(settings.value("messTypes").toString());
+  _messTypesLineEdit->setMaximumWidth(9*ww);
   _waitTimeSpinBox   = new QSpinBox();
   _waitTimeSpinBox->setMinimum(1);
@@ -327 +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>"));
 
   // Canvas with Editable Fields
@@ -341 +344 @@
   QWidget* cgroup = new QWidget();
   QWidget* ogroup = new QWidget();
+  QWidget* rgroup = new QWidget();
   aogroup->addTab(pgroup,tr("Proxy"));
   aogroup->addTab(ggroup,tr("General"));
@@ -348 +352 @@
   aogroup->addTab(cgroup,tr("Ephemeris Corrections"));
   aogroup->addTab(agroup,tr("Monitor"));
+  aogroup->addTab(rgroup,tr("RTCM Message Types"));
 
   QGridLayout* pLayout = new QGridLayout;
@@ -421 +426 @@
   aLayout->addWidget(new QLabel("Network monitoring, outages, handling of corrupted streams, latencies, statistics."),5,0,1,4,Qt::AlignLeft);
   agroup->setLayout(aLayout);
+
+  QGridLayout* rLayout = new QGridLayout;
+  rLayout->setColumnMinimumWidth(0,12*ww);
+  rLayout->setColumnMinimumWidth(1,30*ww);
+  rLayout->setColumnMinimumWidth(2,30*ww);
+  rLayout->addWidget(new QLabel("Mountpoint"),0,0, Qt::AlignLeft);
+  rLayout->addWidget(_messTypesLineEdit,0,1);
+  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("    "),2,0);
+  rLayout->addWidget(new QLabel("    "),3,0);
+  rLayout->addWidget(new QLabel("    "),4,0);
+  rLayout->addWidget(new QLabel("    "),5,0);
+  rgroup->setLayout(rLayout);
 
   QGridLayout* oLayout = new QGridLayout;
@@ -613 +631 @@
   settings.setValue("logFile",     _logFileLineEdit->text());
   settings.setValue("adviseScript",_adviseScriptLineEdit->text());
+  settings.setValue("messTypes",   _messTypesLineEdit->text());
   
 QStringList mountPoints;

trunk/BNC/bncwindow.h

@@ -104 +104 @@
     QLineEdit* _ephPathLineEdit;
     QLineEdit* _corrPathLineEdit;
+    QLineEdit* _messTypesLineEdit;
     QCheckBox* _rnxV3CheckBox;
     QCheckBox* _ephV3CheckBox;