Changeset 6619 in ntrip

Timestamp:

Mar 3, 2015, 10:27:17 AM (9 years ago)

Author:

stuerze

Message:

some fixes BDS encoder

File:

• trunk/BNC/src/RTCM3/ephEncoder.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/ephEncoder.cpp

@@ -349 +349 @@
   BDSADDBITS(12, RTCM3ID_BDS)
   BDSADDBITS(6, eph._prn.number())
-  BDSADDBITS(13, eph._TOC.gpsw())
+  BDSADDBITS(13, eph._TOC_bdt.gpsw() - 1356.0)
   BDSADDBITS(4, 15);// URAI = 15: no accuracy prediction
   BDSADDBITSFLOAT(14, eph._IDOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<13))
   BDSADDBITS(5, eph._AODE)
-  BDSADDBITS(17, static_cast<int>(eph._TOC.gpssec())>>3)
+  BDSADDBITS(17, static_cast<int>(eph._TOC_bdt.gpssec())>>3)
   BDSADDBITSFLOAT(11, eph._clock_driftrate, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<6))
   BDSADDBITSFLOAT(22, eph._clock_drift, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<20))
@@ -365 +365 @@
   BDSADDBITSFLOAT(18, eph._Cus, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
   BDSADDBITSFLOAT(32, eph._sqrt_A, 1.0/static_cast<double>(1<<19))
-  BDSADDBITS(17, static_cast<int>(eph._TOE.gpssec())>>3)
+  BDSADDBITS(17, static_cast<int>(eph._TOE_bdt.gpssec())>>3)
   BDSADDBITSFLOAT(18, eph._Cic, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
   BDSADDBITSFLOAT(32, eph._OMEGA0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
   BDSADDBITSFLOAT(18, eph._Cis, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
   BDSADDBITSFLOAT(32, eph._i0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
-  BDSADDBITSFLOAT(18, eph._Crc, 1.0/static_cast<double>(1<<8))
+  BDSADDBITSFLOAT(18, eph._Crc, 1.0/static_cast<double>(1<<6))
   BDSADDBITSFLOAT(32, eph._omega, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
   BDSADDBITSFLOAT(24, eph._OMEGADOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<13))