Changeset 8854 in ntrip for branches/BNC_2.12/src/RTCM3

Timestamp:

Nov 20, 2019, 2:52:17 PM (5 years ago)

Author:

stuerze

Message:

small improvement with respect to fit interval for GPS and QZSS at least if the flag is 0

Location:

branches/BNC_2.12/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (4 diffs)
• ephEncoder.cpp (modified) (3 diffs)

branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

@@ -1029 +1029 @@
     int i, week;
     uint64_t numbits = 0, bitfield = 0;
+    int fitIntervalFalg = 0;
 
     data += 3; /* header */
@@ -1080 +1081 @@
     GETBITS(eph._health, 6)
     GETBITS(eph._L2PFlag, 1)
-    GETBITS(eph._fitInterval, 1)
+    GETBITS(fitIntervalFalg, 1)
+    if (fitIntervalFalg == 0) {
+      eph._fitInterval = 4.0;
+    }
     eph._TOT = 0.9999e9;
 
@@ -1185 +1189 @@
     int i, week;
     uint64_t numbits = 0, bitfield = 0;
-
+    int fitIntervalFalg = 0;
+    
     data += 3; /* header */
     size -= 6; /* header + crc */
@@ -1241 +1246 @@
     GETFLOATSIGN(eph._TGD, 8, 1.0 / (double )(1 << 30) / (double )(1 << 1))
     GETBITS(eph._IODC, 10)
-    GETBITS(eph._fitInterval, 1)
+    GETBITS(fitIntervalFalg, 1)
+    if (fitIntervalFalg == 0) {
+      eph._fitInterval = 2.0;
+    }
     eph._TOT = 0.9999e9;
 

branches/BNC_2.12/src/RTCM3/ephEncoder.cpp

@@ -15 +15 @@
   unsigned long long bitbuffer = 0;
   int ura = indexFromAccuracy(eph._ura, eph.type());
-  int L5Flag, SFlag;
+  int L5Flag, SFlag, fitIntervalFlag;
   
   if (eph.type() == t_eph::QZSS) {
@@ -47 +47 @@
     GPSADDBITSFLOAT(8, eph._TGD, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
     GPSADDBITS(10, eph._IODC)
-    GPSADDBITS(1, eph._fitInterval)
+    (eph._fitInterval == 2.0) ? fitIntervalFlag = 0 : fitIntervalFlag = 1;
+    GPSADDBITS(1, fitIntervalFlag)
     GPSADDBITS(3, 0) /* padding */
  } else if (eph.type() == t_eph::IRNSS) {
@@ -125 +126 @@
     GPSADDBITS(6, eph._health)
     GPSADDBITS(1, eph._L2PFlag)
-    GPSADDBITS(1, eph._fitInterval)
+    (eph._fitInterval == 4.0) ? fitIntervalFlag = 0 : fitIntervalFlag = 1;
+    GPSADDBITS(1, fitIntervalFlag)
   }