Changeset 2257 in ntrip

Timestamp:

Jan 16, 2010, 11:45:40 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk

Files:

• BNC/RTCM3/ephemeris.cpp (modified) (2 diffs)
• BNC/RTCM3/ephemeris.h (modified) (2 diffs)
• BNC/bncapp.cpp (modified) (2 diffs)
• BNC/bnctime.cpp (modified) (1 diff)
• BNS/bnctime.cpp (added)
• BNS/bnctime.h (added)
• BNS/bns.pro (modified) (2 diffs)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -256 +256 @@
   int ww  = ee->GPSWeek;
   int tow = ee->GPSTOW; 
-
-  updatetime(&ww, &tow, ee->tb*1000, 0);
-
-  int tk = ee->tk-3*60*60; 
-  if (tk < 0) {
-    tk += 86400;
-  }
+  updatetime(&ww, &tow, ee->tb*1000, 0);  // Moscow -> GPS
 
   _GPSweek           = ww;
   _GPSweeks          = tow;
-  _gps_utc           = 0.0;
   _E                 = ee->E;
   _tau               = ee->tau;
@@ -281 +274 @@
   _health            = 0;
   _frequency_number  = ee->frequency_number;
-  _tki               = tk;
+  _tki               = ee->tk-3*60*60; if (_tki < 0) _tki += 86400;
 
   // Initialize status vector

trunk/BNC/RTCM3/ephemeris.h

@@ -91 +91 @@
 class t_ephGlo : public t_eph {
  public:
-  t_ephGlo() { _gps_utc = 0.0; _xv.ReSize(6); }
+  t_ephGlo() { _xv.ReSize(6); }
 
   virtual ~t_ephGlo() {}
@@ -109 +109 @@
   mutable ColumnVector _xv;  // status vector (position, velocity) at time _tt
 
-  double  _gps_utc;          // GPS - UTC in seconds      
   double  _E;                // [days]   
   double  _tau;              // [s]      

trunk/BNC/bncapp.cpp

@@ -218 +218 @@
     wwOld  = (*ee)->GPSWeek;
     towOld = (*ee)->GPSTOW; 
-    updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);
+    updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);  // Moscow -> GPS
 
     wwNew  = glonasseph->GPSWeek;
     towNew = glonasseph->GPSTOW; 
-    updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0);
+    updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0); // Moscow -> GPS
   }
 
@@ -481 +481 @@
   struct converttimeinfo cti;
 
-  updatetime(&ww, &tow, ep->tb*1000, 1);
+  updatetime(&ww, &tow, ep->tb*1000, 1);  // Moscow -> UTC
   converttime(&cti, ww, tow);
 

trunk/BNC/bnctime.cpp

@@ -6 +6 @@
 
 #include "bnctime.h"
-#include "RTCM3/timeutils.h"
+#include "timeutils.h"
 
 using namespace std;

trunk/BNS/bns.pro

@@ -33 +33 @@
           bnseph.h    bnsutils.h bnsrinex.h bnssp3.h bnsoutf.h        \
           bnscaster.h RTCM/clock_orbit_rtcm.h bnssettings.h bnsapp.h  \
-          bnscustomtrafo.h RTCM/rtcm3torinex.h
+          bnscustomtrafo.h RTCM/rtcm3torinex.h bnctime.h
 
 HEADERS += newmat/controlw.h newmat/include.h newmat/myexcept.h  \
@@ -42 +42 @@
           bnseph.cpp  bnsutils.cpp bnsrinex.cpp bnssp3.cpp bnsoutf.cpp \
           bnscaster.cpp bnssettings.cpp bnsapp.cpp bnscustomtrafo.cpp  \
-          RTCM/clock_orbit_rtcm.c RTCM/rtcm3torinex.c
+          RTCM/clock_orbit_rtcm.c RTCM/rtcm3torinex.c bnctime.cpp
 
 SOURCES += newmat/bandmat.cpp newmat/cholesky.cpp newmat/evalue.cpp  \