Changeset 9328 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Dec 17, 2020, 11:53:34 PM (4 years ago)

Author:

stuerze

Message:

bug fixed in IRNSS epehemeris ecoding / decoding

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (2 diffs)
• ephEncoder.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1358 +1358 @@
     GETFLOATSIGN(eph._Crs,  15, 1.0 / (double )(1 <<  4))
     GETFLOATSIGN(eph._IDOT, 14, R2R_PI/(double)(1<<30)/(double)(1<<13))
+    SKIPBITS(2)
     GETFLOATSIGN(eph._M0,   32, R2R_PI/(double)(1<<30)/(double)(1<< 1))
     GETBITS(i, 16)
@@ -1384 +1385 @@
     GETFLOATSIGN(eph._OMEGADOT, 22, R2R_PI/(double)(1<<30)/(double)(1<<11))
     GETFLOATSIGN(eph._i0,       32, R2R_PI/(double)(1<<30)/(double)(1<< 1))
-    SKIPBITS(2)
     SKIPBITS(2)
     eph._TOT = 0.9999e9;

trunk/BNC/src/RTCM3/ephEncoder.cpp

@@ -85 +85 @@
     GPSADDBITSFLOAT(15, eph._Crs, 1.0/static_cast<double>(1<< 4))
     GPSADDBITSFLOAT(14, eph._IDOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<13))
+    GPSADDBITS(2, 0) /* padding */
     GPSADDBITSFLOAT(32, eph._M0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
     GPSADDBITS(16, static_cast<int>(eph._TOEsec)>>4)
@@ -93 +94 @@
     GPSADDBITSFLOAT(22, eph._OMEGADOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<11))
     GPSADDBITSFLOAT(32, eph._i0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
-    GPSADDBITS(2, 0) /* padding */
     GPSADDBITS(2, 0) /* padding */
   } else {