Changeset 2310 in ntrip

Timestamp:

Feb 19, 2010, 3:43:42 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (1 diff)
• bnccaster.cpp (modified) (7 diffs)
• bnccaster.h (modified) (2 diffs)

trunk/BNC/bnc.pro

@@ -2 +2 @@
 # Switch to debug configuration
 # -----------------------------
-CONFIG -= release
-CONFIG += debug
+CONFIG -= debug
+CONFIG += release
 
 

trunk/BNC/bnccaster.cpp

@@ -49 +49 @@
 #include "RTCM/GPSDecoder.h"
 
+static const int MAXRATE = 20; // Hz
+
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
@@ -121 +123 @@
   _epochs = new QMultiMap<long, p_obs>;
 
-  _lastDumpSec   = 0; 
+  _lastDumpSecXrate = 0; 
 
   _confInterval = -1;
@@ -159 +161 @@
   obs->_status = t_obs::received;
 
-  long iSec    = long(floor(obs->_o.GPSWeeks+0.5));
-  long newTime = obs->_o.GPSWeek * 7*24*3600 + iSec;
+  long iSecXrate    = long(floor(obs->_o.GPSWeeks * MAXRATE + 0.5));
+  long newTimeXrate = obs->_o.GPSWeek * 7*24*3600 * MAXRATE + iSecXrate;
 
   // Rename the Station
@@ -199 +201 @@
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
-  if (_lastDumpSec == 0) {
-    _lastDumpSec = newTime - 1;
+  if (_lastDumpSecXrate == 0) {
+    _lastDumpSecXrate = newTimeXrate - 1;
   }
 
   // An old observation - throw it away
   // ----------------------------------
-  if (newTime <= _lastDumpSec) {
+  if (newTimeXrate <= _lastDumpSecXrate) {
     if (firstObs) {
       bncSettings settings;
@@ -211 +213 @@
            !settings.value("outPort").toString().isEmpty() ) { 
 
-        QTime enomtime = QTime(0,0,0).addSecs(iSec);
+        QTime enomtime = QTime(0,0,0).addMSecs(iSecXrate/MAXRATE/1000);
 
         emit( newMessage(QString("%1: Old epoch %2 (%3) thrown away")
-                         .arg(staID.data()).arg(iSec)
+                         .arg(staID.data()).arg(iSecXrate/MAXRATE)
                          .arg(enomtime.toString("HH:mm:ss"))
                          .toAscii(), true) );
@@ -225 +227 @@
   // Save the observation
   // --------------------
-  _epochs->insert(newTime, obs);
+  _epochs->insert(newTimeXrate, obs);
 
   // Dump Epochs
   // -----------
-  if (newTime - _waitTime > _lastDumpSec) {
-    dumpEpochs(_lastDumpSec + 1, newTime - _waitTime);
-    _lastDumpSec = newTime - _waitTime;
+  if (newTimeXrate - _waitTimeXrate > _lastDumpSecXrate) {
+    dumpEpochs(_lastDumpSecXrate + 1, newTimeXrate - _waitTimeXrate);
+    _lastDumpSecXrate = newTimeXrate - _waitTimeXrate;
   }
 }
@@ -415 +417 @@
   // Reread several options
   // ----------------------
-  _samplingRate = settings.value("binSampl").toInt();
-  _waitTime     = settings.value("waitTime").toInt();
-  if (_waitTime < 1) {
-    _waitTime = 1;
+  _samplingRate  = settings.value("binSampl").toInt();
+  _waitTimeXrate = settings.value("waitTime").toInt() * MAXRATE; 
+  if (_waitTimeXrate < 1) {
+    _waitTimeXrate = 1;
   }
 

trunk/BNC/bnccaster.h

@@ -67 +67 @@
    QTextStream*            _out;
    QMultiMap<long, p_obs>* _epochs;
-   long                    _lastDumpSec;
+   long                    _lastDumpSecXrate;
    QTcpServer*             _server;
    QTcpServer*             _uServer;
@@ -77 +77 @@
    QList<bncGetThread*>    _threads;
    int                     _samplingRate;
-   long                    _waitTime;
+   long                    _waitTimeXrate;
    QMutex                  _mutex;
    int                     _confInterval;