Changeset 6812 in ntrip for trunk/BNC/src/RTCM3/ephEncoder.cpp
- Timestamp:
- May 5, 2015, 3:44:39 PM (9 years ago)
- Location:
- trunk/BNC/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src
- Property svn:ignore
-
old new 5 5 debug 6 6 release 7 html
-
- Property svn:ignore
-
trunk/BNC/src/RTCM3
- Property svn:externals
-
old new 1 1 clock_and_orbit http://software.rtcm-ntrip.org/svn/trunk/clock_and_orbit/lib/ 2 rtcm3torinex http://software.rtcm-ntrip.org/svn/trunk/rtcm3torinex/lib/
-
- Property svn:externals
-
trunk/BNC/src/RTCM3/ephEncoder.cpp
r6799 r6812 1 1 2 2 #include "ephEncoder.h" 3 4 extern "C" {5 # include "rtcm3torinex.h"6 }7 3 8 4 using namespace std; … … 47 43 eph._ura = indexFromAccuracy(eph._ura, eph.type()); 48 44 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()) 55 46 GPSADDBITS(10, eph._TOC.gpsw()) 56 47 GPSADDBITS(4, eph._ura) … … 210 201 eph._SISA = indexFromAccuracy(eph._SISA, eph.type()); 211 202 212 bool inav = ( (eph._flags & GALEPHF_INAV) == GALEPHF_INAV ); 213 GALILEOADDBITS(12, inav ? 1046 : 1045) 203 GALILEOADDBITS(12, eph._inav ? 1046 : 1045) 214 204 GALILEOADDBITS(6, eph._prn.number()) 215 205 GALILEOADDBITS(12, eph._TOC.gpsw()) … … 246 236 GALILEOADDBITSFLOAT(10, eph._BGD_1_5A, 1.0/static_cast<double>(1<<30) 247 237 /static_cast<double>(1<<2)) 248 if( inav)238 if(eph._inav) 249 239 { 250 240 GALILEOADDBITSFLOAT(10, eph._BGD_1_5B, 1.0/static_cast<double>(1<<30) 251 241 /static_cast<double>(1<<2)) 252 242 GALILEOADDBITS(2, static_cast<int>(eph._E5bHS)) 253 GALILEOADDBITS(1, eph._ flags & GALEPHF_E5BDINVALID)243 GALILEOADDBITS(1, eph._e5bDataInValid ? 1 : 0) 254 244 } 255 245 else 256 246 { 257 247 GALILEOADDBITS(2, static_cast<int>(eph._E5aHS)) 258 GALILEOADDBITS(1, eph._flags & GALEPHF_E5ADINVALID)248 GALILEOADDBITS(1, eph._e5aDataInValid ? 1 : 0) 259 249 } 260 250 //// eph._TOEsec = 0.9999E9; 261 251 GALILEOADDBITS(20, eph._TOEsec) 262 252 263 GALILEOADDBITS(( inav ? 1 : 3), 0)253 GALILEOADDBITS((eph._inav ? 1 : 3), 0) 264 254 265 255 startbuffer[0]=0xD3; … … 345 335 BDSADDBITS(12, RTCM3ID_BDS) 346 336 BDSADDBITS(6, eph._prn.number()) 347 BDSADDBITS(13, eph._TOC _bdt.gpsw() - 1356.0)337 BDSADDBITS(13, eph._TOC.bdsw() - 1356.0) 348 338 BDSADDBITS(4, eph._URA); 349 339 BDSADDBITSFLOAT(14, eph._IDOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<13)) 350 340 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) 352 342 BDSADDBITSFLOAT(11, eph._clock_driftrate, 1.0/static_cast<double>(1<<30) 353 343 /static_cast<double>(1<<30)/static_cast<double>(1<<6)) … … 362 352 BDSADDBITSFLOAT(18, eph._Cus, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1)) 363 353 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) 365 355 BDSADDBITSFLOAT(18, eph._Cic, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1)) 366 356 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.