Changeset 8904 in ntrip

Timestamp:

Mar 18, 2020, 11:11:28 AM (4 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/upload

Files:

• bncephuploadcaster.cpp (modified) (3 diffs)
• bncrtnetuploadcaster.cpp (modified) (3 diffs)
• bncuploadcaster.cpp (modified) (1 diff)

trunk/BNC/src/upload/bncephuploadcaster.cpp

@@ -91 +91 @@
         int size = 0;
 
-        if (ephGPS && ephGPS->type() == t_eph::GPS &&
-            (system == "ALL" || system == "GPS")) {
+        if      (ephGPS && ephGPS->type() == t_eph::GPS  &&  (system == "ALL" || system == "GPS")) {
           if (timeDiff <= 4*3600) {
             size = t_ephEncoder::RTCM3(*ephGPS, Array);
           }
         }
-        else if (ephGPS && ephGPS->type() == t_eph::QZSS &&
-            (system == "ALL" || system == "QZSS")) {
+        else if (ephGPS && ephGPS->type() == t_eph::QZSS && (system == "ALL" || system == "QZSS")) {
           if (timeDiff <= 4*3600) {
             size = t_ephEncoder::RTCM3(*ephGPS, Array);
@@ -109 +107 @@
         }
         else if (ephGal && (system == "ALL" || system == "Galileo")) {
-          if (timeDiff <= 4*3600) {
+          if (timeDiff <= 2*3600) {
             size = t_ephEncoder::RTCM3(*ephGal, Array);
           }
         }
         else if (ephSBAS && (system == "ALL" || system == "SBAS")) {
-          if (timeDiff <= 600) {
+          if (timeDiff <= 1*3600) {
             size = t_ephEncoder::RTCM3(*ephSBAS, Array);
           }
@@ -121 +119 @@
           if (timeDiff <= 6*3600) {
             size = t_ephEncoder::RTCM3(*ephBDS, Array);
+          }
+        }
+        else if (ephGPS && ephGPS->type() == t_eph::IRNSS && (system == "ALL" || system == "IRNSS")) {
+          if (timeDiff <= 24*3600) {
+            size = t_ephEncoder::RTCM3(*ephGPS, Array);
           }
         }

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -270 +270 @@
   }
 
-  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', 
+  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n',
       QString::SkipEmptyParts);
   _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
@@ -1926 +1926 @@
               phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;
               phasebiasSat->Biases[ii].SignalDiscontinuityCounter = pbSig.discontinuityCounter;
-            }            
+            }
             else if (pbSig.type == "2S") {
               int ii = phasebiasSat->NumberOfPhaseBiases;
@@ -2601 +2601 @@
   // Clock correction proportional to topocentric distance to satellites
   // -------------------------------------------------------------------
-  double rho = (xyz - meanSta).norm_Frobenius();
+  double rho = (xyz - meanSta).NormFrobenius();
   dc = rho * (sc - 1.0) / sc / t_CST::c;
 

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -143 +143 @@
 
   _outSocket = new QTcpSocket();
-  _outSocket->setProxy(QNetworkProxy::NoProxy); // Ntrip1: to prevet the usage of system entries
+  _outSocket->setProxy(QNetworkProxy::NoProxy); // Ntrip1: to prevent the usage of system entries
   _outSocket->connectToHost(_outHost, _outPort);