Changeset 2257 in ntrip


Ignore:
Timestamp:
Jan 16, 2010, 11:45:40 AM (12 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/RTCM3/ephemeris.cpp

    r2237 r2257  
    256256  int ww  = ee->GPSWeek;
    257257  int tow = ee->GPSTOW;
    258 
    259   updatetime(&ww, &tow, ee->tb*1000, 0);
    260 
    261   int tk = ee->tk-3*60*60;
    262   if (tk < 0) {
    263     tk += 86400;
    264   }
     258  updatetime(&ww, &tow, ee->tb*1000, 0);  // Moscow -> GPS
    265259
    266260  _GPSweek           = ww;
    267261  _GPSweeks          = tow;
    268   _gps_utc           = 0.0;
    269262  _E                 = ee->E;
    270263  _tau               = ee->tau;
     
    281274  _health            = 0;
    282275  _frequency_number  = ee->frequency_number;
    283   _tki               = tk;
     276  _tki               = ee->tk-3*60*60; if (_tki < 0) _tki += 86400;
    284277
    285278  // Initialize status vector
  • trunk/BNC/RTCM3/ephemeris.h

    r2222 r2257  
    9191class t_ephGlo : public t_eph {
    9292 public:
    93   t_ephGlo() { _gps_utc = 0.0; _xv.ReSize(6); }
     93  t_ephGlo() { _xv.ReSize(6); }
    9494
    9595  virtual ~t_ephGlo() {}
     
    109109  mutable ColumnVector _xv;  // status vector (position, velocity) at time _tt
    110110
    111   double  _gps_utc;          // GPS - UTC in seconds     
    112111  double  _E;                // [days]   
    113112  double  _tau;              // [s]     
  • trunk/BNC/bncapp.cpp

    r2235 r2257  
    218218    wwOld  = (*ee)->GPSWeek;
    219219    towOld = (*ee)->GPSTOW;
    220     updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);
     220    updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);  // Moscow -> GPS
    221221
    222222    wwNew  = glonasseph->GPSWeek;
    223223    towNew = glonasseph->GPSTOW;
    224     updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0);
     224    updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0); // Moscow -> GPS
    225225  }
    226226
     
    481481  struct converttimeinfo cti;
    482482
    483   updatetime(&ww, &tow, ep->tb*1000, 1);
     483  updatetime(&ww, &tow, ep->tb*1000, 1);  // Moscow -> UTC
    484484  converttime(&cti, ww, tow);
    485485
  • trunk/BNC/bnctime.cpp

    r2252 r2257  
    66
    77#include "bnctime.h"
    8 #include "RTCM3/timeutils.h"
     8#include "timeutils.h"
    99
    1010using namespace std;
  • trunk/BNS/bns.pro

    r2017 r2257  
    3333          bnseph.h    bnsutils.h bnsrinex.h bnssp3.h bnsoutf.h        \
    3434          bnscaster.h RTCM/clock_orbit_rtcm.h bnssettings.h bnsapp.h  \
    35           bnscustomtrafo.h RTCM/rtcm3torinex.h
     35          bnscustomtrafo.h RTCM/rtcm3torinex.h bnctime.h
    3636
    3737HEADERS += newmat/controlw.h newmat/include.h newmat/myexcept.h  \
     
    4242          bnseph.cpp  bnsutils.cpp bnsrinex.cpp bnssp3.cpp bnsoutf.cpp \
    4343          bnscaster.cpp bnssettings.cpp bnsapp.cpp bnscustomtrafo.cpp  \
    44           RTCM/clock_orbit_rtcm.c RTCM/rtcm3torinex.c
     44          RTCM/clock_orbit_rtcm.c RTCM/rtcm3torinex.c bnctime.cpp
    4545
    4646SOURCES += newmat/bandmat.cpp newmat/cholesky.cpp newmat/evalue.cpp  \
Note: See TracChangeset for help on using the changeset viewer.