Changeset 6860 in ntrip for trunk/BNC/src/upload

Timestamp:

May 28, 2015, 3:19:20 PM (10 years ago)

Author:

stuerze

Message:

extension of the rtnetuploadcaster interface regarding RTCM SSR II VTEC messages

Location:

trunk/BNC/src/upload

Files:

• bncrtnetuploadcaster.cpp (modified) (7 diffs)
• bncrtnetuploadcaster.h (modified) (1 diff)

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -315 +315 @@
   struct PhaseBias phasebias;
   memset(&phasebias, 0, sizeof(phasebias));
+  unsigned int dispInd = 0;
+  unsigned int mwInd = 0;
   phasebias.EpochTime[CLOCKORBIT_SATGPS]     = co.EpochTime[CLOCKORBIT_SATGPS];
   phasebias.EpochTime[CLOCKORBIT_SATGLONASS] = co.EpochTime[CLOCKORBIT_SATGLONASS];
@@ -325 +327 @@
   phasebias.SSRSolutionID = _SID;
 
+  struct VTEC vtec;
+  memset(&vtec, 0, sizeof(vtec));
+  vtec.EpochTime = static_cast<int>(epoTime.gpssec());
+  vtec.SSRIOD        = _IOD;
+  vtec.SSRProviderID = _PID;
+  vtec.SSRSolutionID = _SID;
+
+
   // Default Update Interval
   // -----------------------
@@ -346 +356 @@
   for (int ii = 1; ii < lines.size(); ii++) {
 
-    QString      prn;
+    QString      prn;  // prn or key VTEC, IND (phase bias indicators)
     ColumnVector rtnAPC;
     ColumnVector rtnVel;
@@ -355 +365 @@
 
     in >> prn;
+
+    // non-satellite specific parameters
+    if      (prn.contains("IND", Qt::CaseSensitive)) {
+      in >> dispInd >> mwInd;
+      continue;
+    }
+    if (prn.contains("VTEC", Qt::CaseSensitive)) {
+      in >> vtec.UpdateInterval >> vtec.NumLayers;
+      for (unsigned ll = 0; ll < vtec.NumLayers; ll++) {
+        int dummy;
+        in >> dummy >> vtec.Layers[ll].Degree >> vtec.Layers[ll].Order
+          >> vtec.Layers[ll].Height;
+        ii++;
+        for (unsigned iDeg = 0; iDeg < vtec.Layers[ll].Degree; iDeg++) {
+          for (unsigned iOrd = 0; iOrd < vtec.Layers[ll].Order; iOrd++) {
+            in >> vtec.Layers[ll].Cosinus[iDeg][iOrd];
+          }
+          ii++;
+        }
+        for (unsigned iDeg = 0; iDeg < vtec.Layers[ll].Degree; iDeg++) {
+          for (unsigned iOrd = 0; iOrd < vtec.Layers[ll].Order; iOrd++) {
+            in >> vtec.Layers[ll].Sinus[iDeg][iOrd];
+          }
+          ii++;
+        }
+      }
+      continue;
+    }
 
     const t_eph* ephLast = _ephUser->ephLast(prn);
@@ -444 +482 @@
         else if (key == "YawRate") {
           in >> numVal >> pbSat.yR;
-        }
-        else if (key == "DisInd") {
-          in >> numVal >> pbSat.dispInd;
-        }
-        else if (key == "MwInd") {
-          in >> numVal >> pbSat.mwInd;
         }
         else if (key == "PhaseBias") {
@@ -947 +979 @@
 
       if (phasebiasSat) {
-        phasebias.DispersiveBiasConsistencyIndicator = pbSat.dispInd;
-        phasebias.MWConsistencyIndicator = pbSat.mwInd;
+        phasebias.DispersiveBiasConsistencyIndicator = dispInd;
+        phasebias.MWConsistencyIndicator = mwInd;
         phasebiasSat->ID = prn.mid(1).toInt();
         phasebiasSat->NumberOfPhaseBiases = 0;
@@ -1643 +1675 @@
   // ----
   QByteArray hlpBufferVtec;
-
-  _outBuffer += hlpBufferCo + hlpBufferBias + hlpBufferPhaseBias;
+  if (vtec.NumLayers > 0) {
+    char obuffer[CLOCKORBIT_BUFFERSIZE];
+    int len = MakeVTEC(&vtec, 0, obuffer, sizeof(obuffer));
+    if (len > 0) {
+      hlpBufferVtec = QByteArray(obuffer, len);
+    }
+  }
+
+  _outBuffer += hlpBufferCo + hlpBufferBias + hlpBufferPhaseBias + hlpBufferVtec;
 }
 

trunk/BNC/src/upload/bncrtnetuploadcaster.h

@@ -74 +74 @@
   double yA;
   double yR;
-  unsigned int dispInd;
-  unsigned int mwInd;
 };