Changeset 2492 in ntrip


Ignore:
Timestamp:
Jun 1, 2010, 8:18:33 PM (12 years ago)
Author:
stoecker
Message:

removed double storage of RTCM3 stuff

Location:
trunk/BNC
Files:
4 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/GPSS/gpssDecoder.h

    r1445 r2492  
    66
    77#include "RTCM/GPSDecoder.h"
    8 #include "RTCM3/rtcm3torinex.h"
     8#include "rtcm3torinex.h"
    99
    1010class gpssDecoder : public QObject, public GPSDecoder {
  • trunk/BNC/RTCM/RTCM2Decoder.h

    r1304 r2492  
    3333#include "RTCM2.h"
    3434#include "RTCM2_2021.h"
    35 #include "../RTCM3/rtcm3torinex.h"
    36 #include "../RTCM3/ephemeris.h"
     35#include "rtcm3torinex.h"
     36#include "ephemeris.h"
    3737
    3838class RTCM2Decoder: public GPSDecoder {
  • trunk/BNC/RTCM/rtcm_utils.cpp

    r1044 r2492  
    33#include <math.h>
    44#include <stdio.h>
    5 #include <RTCM3/rtcm3torinex.h>
    6 #include <RTCM3/ephemeris.h>
     5#include <rtcm3torinex.h>
     6#include <ephemeris.h>
    77
    88#include "rtcm_utils.h"
  • trunk/BNC/RTCM3

  • trunk/BNC/RTCM3/RTCM3Decoder.cpp

    r2463 r2492  
    307307                    obs->_o.L1            = _Parser.Data.measdata[ii][pos] + modulusAmb;
    308308                    obs->_o.SNR1          = _Parser.Data.snrL1[ii];
    309                     obs->_o.lock_timei_L1 = _Parser.lastlockl1[isat];
     309                    obs->_o.lock_timei_L1 = _Parser.lastlockGPSl1[isat];
    310310                  }
    311311                  else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) {
    312312                    obs->_o.L2            = _Parser.Data.measdata[ii][pos] + modulusAmb;
    313313                    obs->_o.SNR2          = _Parser.Data.snrL2[ii];
    314                     obs->_o.lock_timei_L2 = _Parser.lastlockl2[isat];
     314                    obs->_o.lock_timei_L2 = _Parser.lastlockGPSl2[isat];
    315315                  }
    316316                  else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) {
  • trunk/BNC/RTCM3/ephemeris.h

    r2257 r2492  
    77#include <string>
    88extern "C" {
    9 #include "RTCM3/rtcm3torinex.h"
     9#include "rtcm3torinex.h"
    1010}
    1111
  • trunk/BNC/RTIGS/RTIGSDecoder.h

    r1218 r2492  
    3333// 2/1/2008 SPG Start
    3434extern "C" {
    35         #include "../RTCM3/rtcm3torinex.h"
     35#include "rtcm3torinex.h"
    3636}
    3737
  • trunk/BNC/bnc.pro

    r2310 r2492  
    2929# Include Path
    3030# ------------
    31 INCLUDEPATH = . ./newmat ./RTCM3
     31INCLUDEPATH = . ./newmat ./RTCM3 ./RTCM3/clock_and_orbit ./RTCM3/rtcm3torinex
    3232
    3333HEADERS = bnchelp.html bncgetthread.h    bncwindow.h   bnctabledlg.h  \
     
    4343          RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
    4444          RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
    45           RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex.h                   \
    46           RTCM3/RTCM3coDecoder.h RTCM3/clock_orbit_rtcm.h             \
     45          RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex/rtcm3torinex.h      \
     46          RTCM3/RTCM3coDecoder.h                                      \
     47          RTCM3/clock_and_orbit/clock_orbit_rtcm.h                    \
    4748          RTCM3/ephemeris.h RTCM3/timeutils.h                         \
    4849          RTIGS/RTIGSDecoder.h RTIGS/rtigs_records.h                  \
     
    6869          bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
    6970          bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \
    70           bancroft.cpp bncmodel.cpp bncfigureppp.cpp                  \ 
     71          bancroft.cpp bncmodel.cpp bncfigureppp.cpp                  \
    7172          RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
    7273          RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
    73           RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex.c                 \
    74           RTCM3/RTCM3coDecoder.cpp RTCM3/clock_orbit_rtcm.c           \
     74          RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex/rtcm3torinex.c    \
     75          RTCM3/RTCM3coDecoder.cpp                                    \
     76          RTCM3/clock_and_orbit/clock_orbit_rtcm.c                    \
    7577          RTCM3/ephemeris.cpp RTCM3/timeutils.cpp                     \
    7678          RTIGS/RTIGSDecoder.cpp RTIGS/cgps_transform.cpp             \
  • trunk/BNC/bncgetthread.h

    r2386 r2492  
    3232
    3333#include "RTCM/GPSDecoder.h"
    34 #include "RTCM3/rtcm3torinex.h"
     34#include "rtcm3torinex.h"
    3535#include "bncconst.h"
    3636#include "bncnetquery.h"
  • trunk/BNC/bncrinex.cpp

    r2376 r2492  
    5757#include "bncsettings.h"
    5858#include "bncversion.h"
    59 #include "RTCM3/rtcm3torinex.h"
     59#include "rtcm3torinex.h"
    6060
    6161using namespace std;
Note: See TracChangeset for help on using the changeset viewer.