Changeset 5564 in ntrip for trunk/BNC

Timestamp:

Nov 23, 2013, 5:47:44 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• GPSS/hassDecoder.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (2 diffs)
• bncephuser.h (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (2 diffs)

trunk/BNC/src/GPSS/hassDecoder.cpp

@@ -141 +141 @@
     }
 
+    int SSRProviderID = 0;
+    int SSRSolutionID = 0;
+    int SSRIOD        = 0;
+
     corrLine.sprintf("%d %d %d %.1f %s"
                      "   %3d"
                      "   %8.3f %8.3f %8.3f %8.3f"
                      "   %10.5f %10.5f %10.5f %10.5f"
-                     "   %10.5f",
+                     "   %10.5f"
+                     "   %5d %2d %2d",
                      messageType, updateInterval, coTime.gpsw(), _GPSweeks,
                      prn.toAscii().data(), IOD, 
                      dClk, rao[0], rao[1], rao[2],
-                     0.0, dotRao[0], dotRao[1], dotRao[2], 0.0);
+                     0.0, dotRao[0], dotRao[1], dotRao[2], 0.0,
+                     SSRProviderID, SSRSolutionID, SSRIOD);
 
     RTCM3coDecoder::reopen(_fileNameSkl, _fileName, _out);    

trunk/BNC/src/bncephuser.cpp

@@ -218 +218 @@
        >> dClk       >> rao[0]       >> rao[1]       >> rao[2]
        >> dotDClk    >> dotRao[0]    >> dotRao[1]    >> dotRao[2]
-       >> dotDotDClk >> dotDotRao[0] >> dotDotRao[1] >> dotDotRao[2];
+       >> dotDotDClk >> dotDotRao[0] >> dotDotRao[1] >> dotDotRao[2]
+       >> streamID[0]  >> streamID[1]  >> streamID[2];
+
     dClk       /= t_CST::c;
     dotDClk    /= t_CST::c;
@@ -232 +234 @@
     dotDotRao.ReSize(3); dotDotRao = 0.0;
     in >> iod 
-      >> rao[0]       >> rao[1]       >> rao[2]
-      >> dotRao[0]    >> dotRao[1]    >> dotRao[2]
-      >> dotDotRao[0] >> dotDotRao[1] >> dotDotRao[2];
+       >> rao[0]       >> rao[1]       >> rao[2]
+       >> dotRao[0]    >> dotRao[1]    >> dotRao[2]
+       >> dotDotRao[0] >> dotDotRao[1] >> dotDotRao[2]
+       >> streamID[0]  >> streamID[1]  >> streamID[2];
 
     tRao.set(GPSweek, GPSweeks);

trunk/BNC/src/bncephuser.h

@@ -53 +53 @@
     dotDotRao   = 0.0;
     eph         = 0;
+    streamID[0] = 0;
+    streamID[0] = 0;
+    streamID[0] = 0;
   }
   
@@ -85 +88 @@
   ColumnVector dotDotRao;
   const t_eph* eph;
+  int          streamID[3];
 };
 

trunk/BNC/src/combination/bnccomb.cpp

@@ -707 +707 @@
 
     QString line;
-    int messageType = COTYPE_GPSCOMBINED;
-    int updateInt   = 0;
+    int messageType   = COTYPE_GPSCOMBINED;
+    int updateInt     = 0;
+    int SSRProviderID = 0;
+    int SSRSolutionID = 0;
+    int SSRIOD        = 0;
     line.sprintf("%d %d %d %.1f %s"
                  "   %3d"
                  "   %8.3f %8.3f %8.3f %8.3f"
                  "   %10.5f %10.5f %10.5f %10.5f"
-                 "   %10.5f  %10.5f %10.5f %10.5f INTERNAL",
+                 "   %10.5f  %10.5f %10.5f %10.5f"
+                 "   %5d %2d %2d INTERNAL",
                  messageType, updateInt, _resTime.gpsw(), _resTime.gpssec(),
                  corr->prn.toAscii().data(),
@@ -728 +732 @@
                  corr->dotDotRao[0],
                  corr->dotDotRao[1],
-                 corr->dotDotRao[2]);
+                 corr->dotDotRao[2],
+                 SSRProviderID, SSRSolutionID, SSRIOD);
     corrLines << line;