Changeset 11057 in ntrip for trunk/BNC/src/ephemeris.cpp

Timestamp:

Sep 30, 2026, 11:30:26 AM (12 days ago)

Author:

stuerze

Message:

bug fixes resulting from overall tests

File:

• trunk/BNC/src/ephemeris.cpp (modified) (6 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -648 +648 @@
     }
   }
+
+  // CNAV/CNAV-2 records carry no separate t_oe: t_oe = t_oc
+  // (RINEX 4.02 Tables A9/A11, IS-GPS-200 30.3.4.4, IS-GPS-800 3.5.3.7.1).
+  // NavIC L1NV (RINEX 4.02 Table A31): single reference epoch t_oec for
+  // ephemeris and clock (NavIC L1 SPS ICD 6.2.1.6, Appendices A and B).
+  // ---------------------------------------------------------------------
+  if (type() == t_eph::CNAV || type() == t_eph::CNV2 || type() == t_eph::L1NV) {
+    _TOEweek = _TOC.gpsw();
+    _TOEsec  = _TOC.gpssec();
+  }
 }
 
@@ -672 +682 @@
 
   double n = n0 + _Delta_n;
+
+  // CNAV/CNAV-2 (IS-GPS-200 Table 30-II) and NavIC L1NV (NavIC L1 SPS
+  // ICD Appendix A): semi-major axis and mean motion difference are
+  // time-variable, A_k = A0 + Adot*tk and
+  // n_A = n0 + Delta_n0 + 1/2*Delta_n0_dot*tk.
+  // n0 is computed from A0 for GPS/QZSS but from A_k for NavIC L1NV.
+  double A    = a0;
+  double Adot = 0.0;
+  if (type() == t_eph::CNAV || type() == t_eph::CNV2 || type() == t_eph::L1NV) {
+    Adot = _ADOT;
+    A   += _ADOT * tk;
+    n   += 0.5 * _Delta_n_dot * tk;
+    if (type() == t_eph::L1NV) {
+      n += sqrt(gmGRS / (A * A * A)) - n0;
+    }
+  }
+
   double M = _M0 + n * tk;
   double E = M;
@@ -688 +715 @@
   double sin2u0 = sin(2 * u0);
   double cos2u0 = cos(2 * u0);
-  double r = a0 * (1 - _e * cos(E)) + _Crc * cos2u0 + _Crs * sin2u0;
+  double r = A * (1 - _e * cos(E)) + _Crc * cos2u0 + _Crs * sin2u0;
   double i = _i0 + _IDOT * tk + _Cic * cos2u0 + _Cis * sin2u0;
   double u = u0 + _Cuc * cos2u0 + _Cus * sin2u0;
@@ -715 +742 @@
   double dotom = _OMEGADOT - omegaEarth;
   double doti = _IDOT + (-_Cic * sin2u0 + _Cis * cos2u0) * 2 * dotv;
-  double dotr = a0 * _e * sin(E) * dEdM * n
+  double dotr = A * _e * sin(E) * dEdM * n + Adot * (1 - _e * cos(E))
       + (-_Crc * sin2u0 + _Crs * cos2u0) * 2 * dotv;
   double dotx = dotr * cos(u) - r * sin(u) * dotu;
@@ -740 +767 @@
   }
   else {
-    xc[3] -= 4.442807633e-10 * _e * sqrt(a0) * sin(E);
+    xc[3] -= 4.442807633e-10 * _e * sqrt(A) * sin(E);
   }
 
@@ -1087 +1114 @@
       switch (type()) {
         case  t_eph::LNAV:
-        case  t_eph::CNAV:
         case  t_eph::CNV2:
           if (_health == 0.0) {
+            return 0;
+          }
+          else {
+            return 1;
+          }
+          break;
+        case  t_eph::CNAV:
+          // RINEX 4: bits 52(MSB)-54(LSB) of msg 10 = L1, L2, L5 health.
+          // An L5-only flag (value 1, common while L5 is not fully
+          // operational) does not make orbit/clock unusable; the data set
+          // is unhealthy if L1 or L2 is flagged.
+          if ((int(_health) & 0x6) == 0) {
             return 0;
           }