Changeset 6812 in ntrip for trunk/BNC/src/RTCM3/ephEncoder.cpp


Ignore:
Timestamp:
May 5, 2015, 3:44:39 PM (9 years ago)
Author:
stoecker
Message:

integrate RTCM3 parsing into BNC and directly fill target structures, add doxygen documentation

Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src

    • Property svn:ignore

      •  

        old new  
        55debug
        66release
         7html

  • trunk/BNC/src/RTCM3

    • Property svn:externals

      •  

        old new  
        11clock_and_orbit http://software.rtcm-ntrip.org/svn/trunk/clock_and_orbit/lib/
        2 rtcm3torinex    http://software.rtcm-ntrip.org/svn/trunk/rtcm3torinex/lib/

  • trunk/BNC/src/RTCM3/ephEncoder.cpp

    r6799 r6812  
    11
    22#include "ephEncoder.h"
    3 
    4 extern "C" {
    5 #  include "rtcm3torinex.h"
    6 }
    73
    84using namespace std;
    … …  
    4743  eph._ura = indexFromAccuracy(eph._ura, eph.type());
    4844  GPSADDBITS(12, 1019)
    49   if (eph._prn.system() == 'J') {
    50     GPSADDBITS(6,eph._prn.number() + PRN_QZSS_START - 1)
    51   }
    52   else {
    53     GPSADDBITS(6,eph._prn.number())
    54   }
     45  GPSADDBITS(6,eph._prn.number())
    5546  GPSADDBITS(10, eph._TOC.gpsw())
    5647  GPSADDBITS(4, eph._ura)
    … …  
    210201  eph._SISA = indexFromAccuracy(eph._SISA, eph.type());
    211202
    212   bool inav = ( (eph._flags & GALEPHF_INAV) == GALEPHF_INAV );
    213   GALILEOADDBITS(12, inav ? 1046 : 1045)
     203  GALILEOADDBITS(12, eph._inav ? 1046 : 1045)
    214204  GALILEOADDBITS(6, eph._prn.number())
    215205  GALILEOADDBITS(12, eph._TOC.gpsw())
    … …  
    246236  GALILEOADDBITSFLOAT(10, eph._BGD_1_5A, 1.0/static_cast<double>(1<<30)
    247237  /static_cast<double>(1<<2))
    248   if(inav)
     238  if(eph._inav)
    249239  {
    250240    GALILEOADDBITSFLOAT(10, eph._BGD_1_5B, 1.0/static_cast<double>(1<<30)
    251241    /static_cast<double>(1<<2))
    252242    GALILEOADDBITS(2, static_cast<int>(eph._E5bHS))
    253     GALILEOADDBITS(1, eph._flags & GALEPHF_E5BDINVALID)
     243    GALILEOADDBITS(1, eph._e5bDataInValid ? 1 : 0)
    254244  }
    255245  else
    256246  {
    257247    GALILEOADDBITS(2, static_cast<int>(eph._E5aHS))
    258     GALILEOADDBITS(1, eph._flags & GALEPHF_E5ADINVALID)
     248    GALILEOADDBITS(1,  eph._e5aDataInValid ? 1 : 0)
    259249  }
    260250  ////  eph._TOEsec = 0.9999E9;
    261251  GALILEOADDBITS(20, eph._TOEsec)
    262252
    263   GALILEOADDBITS((inav ? 1 : 3), 0)
     253  GALILEOADDBITS((eph._inav ? 1 : 3), 0)
    264254
    265255  startbuffer[0]=0xD3;
    … …  
    345335  BDSADDBITS(12, RTCM3ID_BDS)
    346336  BDSADDBITS(6, eph._prn.number())
    347   BDSADDBITS(13, eph._TOC_bdt.gpsw() - 1356.0)
     337  BDSADDBITS(13, eph._TOC.bdsw() - 1356.0)
    348338  BDSADDBITS(4, eph._URA);
    349339  BDSADDBITSFLOAT(14, eph._IDOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<13))
    350340  BDSADDBITS(5, eph._AODE)
    351   BDSADDBITS(17, static_cast<int>(eph._TOC_bdt.gpssec())>>3)
     341  BDSADDBITS(17, static_cast<int>(eph._TOC.bdssec())>>3)
    352342  BDSADDBITSFLOAT(11, eph._clock_driftrate, 1.0/static_cast<double>(1<<30)
    353343      /static_cast<double>(1<<30)/static_cast<double>(1<<6))
    … …  
    362352  BDSADDBITSFLOAT(18, eph._Cus, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
    363353  BDSADDBITSFLOAT(32, eph._sqrt_A, 1.0/static_cast<double>(1<<19))
    364   BDSADDBITS(17, static_cast<int>(eph._TOE_bdt.gpssec())>>3)
     354  BDSADDBITS(17, static_cast<int>(eph._TOE.bdssec())>>3)
    365355  BDSADDBITSFLOAT(18, eph._Cic, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
    366356  BDSADDBITSFLOAT(32, eph._OMEGA0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
Note: See TracChangeset for help on using the changeset viewer.