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

Timestamp:

Nov 8, 2024, 2:13:26 PM (4 months ago)

Author:

stuerze

Message:

updates regarding RINEX version 4.02 navigation information

File:

• trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (modified) (9 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1134 +1134 @@
     eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
     eph._TOT = 0.9999e9;
-    eph._navType = t_eph::LNAV;
+    eph._ephType = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1315 +1315 @@
     _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frequency_number, 2, 'f', 0);
 
-    eph._navType = t_eph::FDMA;
+    eph._ephType = t_eph::FDMA;
 
     emit newGlonassEph(eph);
@@ -1429 +1429 @@
 
     GETBITS(i, 4)
-    if (i <= 6)
-      eph._ura = ceil(10.0 * pow(2.0, 1.0 + i / 2.0)) / 10.0;
-    else
-      eph._ura = ceil(10.0 * pow(2.0, i / 2.0)) / 10.0;
+    eph._ura = accuracyFromIndex(i, eph.type());
     GETBITS(eph._health, 6)
     GETFLOATSIGN(eph._TGD,       8, 1.0 / (double )(1 << 30) / (double )(1 << 1))
@@ -1439 +1436 @@
     eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
     eph._TOT = 0.9999e9;
-    eph._navType = t_eph::LNAV;
+    eph._ephType = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1570 +1567 @@
     SKIPBITS(2)
     eph._TOT = 0.9999e9;
-    eph._navType = t_eph::LNAV;
+    eph._ephType = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1645 +1642 @@
     eph._TOT = 0.9999E9;
     eph._health = 0;
-    eph._navType = t_eph::SBASL1;
+    eph._ephType = t_eph::SBASL1;
 
     emit newSBASEph(eph);
@@ -1770 +1767 @@
         return false;
       }
-      eph._navType = t_eph::INAF;
+      eph._ephType = t_eph::INAF;
     }
     else {
@@ -1782 +1779 @@
       GETBITS(eph._E5aHS, 2)
       GETBITS(eph._e5aDataInValid, 1)
-      eph._navType = t_eph::FNAV;
+      eph._ephType = t_eph::FNAV;
     }
     eph._TOT = 0.9999e9;
@@ -1906 +1903 @@
     eph._TOT = 0.9999E9;
     if (eph._i0 > iMaxGEO) {
-      eph._navType = t_eph::D1;
+      eph._ephType = t_eph::D1;
     }
     else {
-      eph._navType = t_eph::D2;
+      eph._ephType = t_eph::D2;
     }