Changeset 1807 in ntrip

Timestamp:

Apr 23, 2009, 7:11:25 PM (16 years ago)

Author:

zdenek

Message:

ZL: FEATURE: changes for decoding of message 1003 from RTCM 3.0 streams

Location:

trunk/BNC

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (8 diffs)
• RTCM3/RTCM3Decoder.h (modified) (3 diffs)
• RTCM3/ephemeris.h (modified) (1 diff)
• bnccaster.cpp (modified) (1 diff)
• bncgetthread.cpp (modified) (3 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -40 +40 @@
 
 #include <iostream>
+#include <iomanip>
+#include <sstream>
 #include <math.h>
 #include <string.h>
 
 #include "RTCM3Decoder.h"
+#include "../RTCM/rtcm_utils.h"
 #include "bncconst.h"
 #include "bncapp.h"
@@ -89 +92 @@
   // ----------------------------------------------
   _mode = unknown;
+
+  // Antenna position (used for decoding of message 1003)
+  // ----------------------------------------------------
+  _antXYZ[0] = _antXYZ[1] = _antXYZ[2] = 0;
+
 }
 
@@ -148 +156 @@
             _antList.back().zz       = _Parser.antZ * 1e-4;
             _antList.back().message  = rr;
+
+            // Remember station position for 1003 message decoding
+            _antXYZ[0] = _Parser.antX * 1e-4;
+            _antXYZ[1] = _Parser.antY * 1e-4;
+            _antXYZ[2] = _Parser.antZ * 1e-4;
           }
 
@@ -162 +175 @@
             _antList.back().height_f = true;
             _antList.back().message  = rr;
+
+            // Remember station position for 1003 message decoding
+            _antXYZ[0] = _Parser.antX * 1e-4;
+            _antXYZ[1] = _Parser.antY * 1e-4;
+            _antXYZ[2] = _Parser.antZ * 1e-4;
           }
 
@@ -174 +192 @@
             }
             
+            // apply "GPS Integer L1 Pseudorange Modulus Ambiguity"
+            bool applyModulusAmb = false;
+            ///if (rr == 2) {
+            ///  applyModulusAmb = true;
+            ///}
+
             if (rr == 2) {
               emit(newMessage( (_staID + ": No valid RINEX! All values are modulo 299792.458!").toAscii(), true));
@@ -195 +219 @@
               obs->_o.GPSWeek  = _Parser.Data.week;
               obs->_o.GPSWeeks = _Parser.Data.timeofweek / 1000.0;
+
+              // Estimate "GPS Integer L1 Pseudorange Modulus Ambiguity"
+              // -------------------------------------------------------
+              double modulusAmb = 0;
+              if (applyModulusAmb) {
+                // Missing antenna coordinates: skip all data
+                if ( !_antXYZ[0] && !_antXYZ[1] && !_antXYZ[2] ) {
+                  continue;
+                }
+                
+                ostringstream prns;
+                prns << obs->_o.satSys << setfill('0') << setw(2) << obs->_o.satNum;
+
+                string prn = prns.str();
+
+                // Missing ephemerides, skip satellite
+                if (_ephList.find(prn) == _ephList.end()) {
+                  continue;
+                }
+                
+                const t_eph* eph = &(_ephList.find(prn)->second);
+                  
+                double rho, xSat, ySat, zSat, clkSat, GPSWeeks_tot;
+                int    GPSWeek_tot;
+                cmpRho(eph, _antXYZ[0], _antXYZ[1], _antXYZ[2], 
+                       obs->_o.GPSWeek, obs->_o.GPSWeeks,
+                       rho, GPSWeek_tot, GPSWeeks_tot,
+                       xSat, ySat, zSat, clkSat);
+
+                const double CC = 299792458.0;
+
+                int nn = static_cast<int>(rho / (CC * 0.001));
+
+                modulusAmb = nn * CC * 0.001;
+              }
             
+              // Loop over all data types
+              // ------------------------
               for (int jj = 0; jj < _Parser.numdatatypesGPS; jj++) {
                 int v = 0;
@@ -228 +289 @@
                   // variables df and pos are used consequently. Perlt
                   if      (df & GNSSDF_C1DATA) {
-                    obs->_o.C1 = _Parser.Data.measdata[ii][pos];
+                    obs->_o.C1 = _Parser.Data.measdata[ii][pos] + modulusAmb;
                   }
                   else if (df & GNSSDF_C2DATA) {
-                    obs->_o.C2 = _Parser.Data.measdata[ii][pos];
+                    obs->_o.C2 = _Parser.Data.measdata[ii][pos] + modulusAmb;
                   }
                   else if (df & GNSSDF_P1DATA) {
-                    obs->_o.P1 = _Parser.Data.measdata[ii][pos];
+                    obs->_o.P1 = _Parser.Data.measdata[ii][pos] + modulusAmb;
                   }
                   else if (df & GNSSDF_P2DATA) {
-                    obs->_o.P2 = _Parser.Data.measdata[ii][pos];
+                    obs->_o.P2 = _Parser.Data.measdata[ii][pos] + modulusAmb;
                   }
                   else if (df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA)) {
-                    obs->_o.L1            = _Parser.Data.measdata[ii][pos];
+                    obs->_o.L1            = _Parser.Data.measdata[ii][pos] + modulusAmb;
                     obs->_o.SNR1          = _Parser.Data.snrL1[ii];
                     obs->_o.lock_timei_L1 = _Parser.lastlockl1[isat];
                   }
                   else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) {
-                    obs->_o.L2            = _Parser.Data.measdata[ii][pos];
+                    obs->_o.L2            = _Parser.Data.measdata[ii][pos] + modulusAmb;
                     obs->_o.SNR2          = _Parser.Data.snrL2[ii];
                     obs->_o.lock_timei_L2 = _Parser.lastlockl2[isat];
@@ -290 +351 @@
   }
 }
+
+// Store ephemerides
+////////////////////////////////////////////////////////////////////////////////////////
+bool RTCM3Decoder::storeEph(const gpsephemeris& gpseph) {
+  t_ephGPS eph; eph.set(&gpseph);
+
+  return storeEph(eph);
+}
+
+
+bool RTCM3Decoder::storeEph(const t_ephGPS& gpseph) {
+  double weekold = 0.0;
+  double weeknew = gpseph.GPSweek() + gpseph.GPSweeks() / 86400.0;
+  if ( _ephList.find(gpseph.prn()) != _ephList.end() ) {
+    weekold = _ephList.find(gpseph.prn())->second.GPSweek() 
+            + _ephList.find(gpseph.prn())->second.GPSweeks() / 86400.0; 
+  }
+
+  if ( weeknew - weekold > 1/86400.0 ) {
+    _ephList[gpseph.prn()] = gpseph;
+
+    return true;
+  }
+
+  return false;
+}

trunk/BNC/RTCM3/RTCM3Decoder.h

@@ -27 +27 @@
 
 #include <QtCore>
+#include <map>
+
 #include "../RTCM/GPSDecoder.h"
 #include "../RTCM/GPSDecoder.h"
 #include "RTCM3coDecoder.h"
+#include "ephemeris.h"
 
 extern "C" {
@@ -45 +48 @@
   }
 
+  bool  storeEph(const gpsephemeris& gpseph);
+  bool  storeEph(const t_ephGPS&     gpseph);
+
  signals:
   void newMessage(QByteArray msg,bool showOnScreen);
@@ -58 +64 @@
   RTCM3coDecoder*        _coDecoder; 
   t_mode                 _mode;
+
+  std::map<std::string, t_ephGPS> _ephList;
+  double                 _antXYZ[3];
+
 };
 

trunk/BNC/RTCM3/ephemeris.h

@@ -4 +4 @@
 #include <stdio.h>
 #include <string>
+extern "C" {
 #include "RTCM3/rtcm3torinex.h"
+}
 
 class t_eph {

trunk/BNC/bnccaster.cpp

@@ -239 +239 @@
   connect(getThread, SIGNAL(getThreadFinished(QByteArray)), 
           this, SLOT(slotGetThreadFinished(QByteArray)));
+
+  connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
+          getThread, SLOT(slotNewEphGPS(gpsephemeris)));
 
   _staIDs.push_back(getThread->staID());

trunk/BNC/bncgetthread.cpp

@@ -653 +653 @@
 //////////////////////////////////////////////////////////////////////////////
 void bncGetThread::slotNewEphGPS(gpsephemeris gpseph) {
-  RTCM2Decoder* decoder = dynamic_cast<RTCM2Decoder*>(_decoder);
-
-  if ( decoder ) {
+  RTCM2Decoder* decoder2 = dynamic_cast<RTCM2Decoder*>(_decoder);
+  RTCM3Decoder* decoder3 = dynamic_cast<RTCM3Decoder*>(_decoder);
+
+  if ( decoder2 ) {
     QMutexLocker locker(&_mutex);
   
@@ -661 +662 @@
     vector<int> IODs;
     
-    if ( decoder->storeEph(gpseph, storedPRN, IODs) ) {
+    if ( decoder2->storeEph(gpseph, storedPRN, IODs) ) {
 #ifdef DEBUG_RTCM2_2021
       QString msg = _staID + QString(": stored eph %1 IODs").arg(storedPRN.c_str());
@@ -673 +674 @@
     }
   }
-}
-
+
+  if ( decoder3 ) {
+    QMutexLocker locker(&_mutex);
+  
+    if ( decoder3->storeEph(gpseph) ) {
+      QString msg = _staID + QString(": RTCM3Decoder, stored eph for satellite %1").arg(gpseph.satellite);
+      emit(newMessage(msg.toAscii(),true));
+    }
+  }
+}
+