Changeset 5665 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

May 26, 2014, 5:09:47 PM (11 years ago)

Author:

stoecker

Message:

update due to RTCM-SSR fixes

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (7 diffs)
• RTCM3coDecoder.h (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -149 +149 @@
     memcpy(&co_sav, &_co, sizeof(co_sav)); // save state
 
-    GCOB_RETURN irc = GetClockOrbitBias(&_co, &_bias, _buffer.data(),
+    GCOB_RETURN irc = GetSSR(&_co, &_bias, 0, 0, _buffer.data(),
                                         _buffer.size(), &bytesused);
 
@@ -167 +167 @@
 
       if ( (irc == GCOBR_OK          || irc == GCOBR_MESSAGEFOLLOWS ) && 
-           (_co.NumberOfGPSSat   > 0 || _co.NumberOfGLONASSSat   > 0 ||
-            _bias.NumberOfGPSSat > 0 || _bias.NumberOfGLONASSSat > 0) ) {
+           (_co.NumberOfSat[CLOCKORBIT_SATGPS]   > 0 || _co.NumberOfSat[CLOCKORBIT_SATGLONASS]   > 0 ||
+            _bias.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || _bias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ) {
 
         reopen(_fileNameSkl, _fileName, _out);
@@ -180 +180 @@
         // Correction Epoch from GPSEpochTime
         // ----------------------------------
-        if (_co.NumberOfGPSSat > 0 || _bias.NumberOfGPSSat > 0) {
-          int GPSEpochTime = (_co.NumberOfGPSSat > 0) ? 
-                             _co.GPSEpochTime : _bias.GPSEpochTime;
+        if (_co.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || _bias.NumberOfSat[CLOCKORBIT_SATGPS] > 0) {
+          int GPSEpochTime = (_co.NumberOfSat[CLOCKORBIT_SATGPS] > 0) ? 
+                             _co.EpochTime[CLOCKORBIT_SATGPS] : _bias.EpochTime[CLOCKORBIT_SATGPS];
           if      (GPSweeksHlp > GPSEpochTime + 86400.0) {
             GPSweek += 1;
@@ -194 +194 @@
         // Correction Epoch from Glonass Epoch
         // -----------------------------------
-        else if (_co.NumberOfGLONASSSat > 0 || _bias.NumberOfGLONASSSat > 0){
-          int GLONASSEpochTime = (_co.NumberOfGLONASSSat > 0) ? 
-                              _co.GLONASSEpochTime : _bias.GLONASSEpochTime;
+        else if (_co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0 || _bias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0){
+          int GLONASSEpochTime = (_co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ? 
+                              _co.EpochTime[CLOCKORBIT_SATGLONASS] : _bias.EpochTime[CLOCKORBIT_SATGLONASS];
 
           // Second of day (GPS time) from Glonass Epoch
@@ -282 +282 @@
 QStringList RTCM3coDecoder::corrsToASCIIlines(int GPSweek, double GPSweeks,
                                               const ClockOrbit& co,
-                                              const Bias* bias) {
+                                              const CodeBias* bias) {
 
   QStringList retLines;
@@ -288 +288 @@
   // Loop over all satellites (GPS and Glonass)
   // ------------------------------------------
-  if (co.NumberOfGPSSat > 0 || co.NumberOfGLONASSSat > 0) {
+  if (co.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) {
     QString line1;
     line1.sprintf("! Orbits/Clocks: %d GPS %d Glonass",
-                  co.NumberOfGPSSat, co.NumberOfGLONASSSat);
+                  co.NumberOfSat[CLOCKORBIT_SATGPS], co.NumberOfSat[CLOCKORBIT_SATGLONASS]);
     retLines << line1;
   }
-  for (int ii = 0; ii < CLOCKORBIT_NUMGPS+co.NumberOfGLONASSSat; ii++) {
+  for (int ii = 0; ii < CLOCKORBIT_NUMGPS+co.NumberOfSat[CLOCKORBIT_SATGLONASS]; ii++) {
     char sysCh = ' ';
-    if      (ii < co.NumberOfGPSSat) {
+    if      (ii < co.NumberOfSat[CLOCKORBIT_SATGPS]) {
       sysCh = 'G';
     }
@@ -385 +385 @@
   // ------------------------------------------
   if (bias) {
-    if (bias->NumberOfGPSSat > 0 || bias->NumberOfGLONASSSat > 0) {
+    if (bias->NumberOfSat[CLOCKORBIT_SATGPS] > 0 || bias->NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) {
       QString line1;
       line1.sprintf("! Biases: %d GPS %d Glonass",
-                    bias->NumberOfGPSSat, bias->NumberOfGLONASSSat);
+                    bias->NumberOfSat[CLOCKORBIT_SATGPS], bias->NumberOfSat[CLOCKORBIT_SATGLONASS]);
       retLines << line1;
     }
-    for (int ii = 0; ii < CLOCKORBIT_NUMGPS + bias->NumberOfGLONASSSat; ii++) {
+    for (int ii = 0; ii < CLOCKORBIT_NUMGPS + bias->NumberOfSat[CLOCKORBIT_SATGLONASS]; ii++) {
       char sysCh = ' ';
       int messageType;
-      if      (ii < bias->NumberOfGPSSat) {
+      if      (ii < bias->NumberOfSat[CLOCKORBIT_SATGPS]) {
         sysCh = 'G';
         messageType = BTYPE_GPS;

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -46 +46 @@
 
   static QStringList corrsToASCIIlines(int GPSweek, double GPSweeks, 
-                                       const ClockOrbit& co, const Bias* bias);
+                                       const ClockOrbit& co, const CodeBias* bias);
   static void reopen(const QString& fileNameSkl, QString& fileName,
                      std::ofstream*& out);
@@ -64 +64 @@
   double         _GPSweeks;
   ClockOrbit     _co;
-  Bias           _bias;
+  CodeBias       _bias;
   int            _providerID[3];
 };