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

Timestamp:

Dec 10, 2024, 3:57:21 PM (3 months ago)

Author:

stuerze

Message:

RINEX version 4.02 updates

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (21 diffs)
• ephEncoder.cpp (modified) (10 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1064 +1064 @@
     }
     GETBITS(i, 4)
-    eph._ura = accuracyFromIndex(i, eph.type());
+    eph._ura = accuracyFromIndex(i, eph.system());
     GETBITS(eph._L2Codes, 2)
     GETFLOATSIGN(eph._IDOT, 14, R2R_PI/(double)(1<<30)/(double)(1<<13))
@@ -1132 +1132 @@
     GETBITS(eph._L2PFlag, 1)
     GETBITS(fitIntervalFalg, 1)
-    eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
+    eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.system());
     eph._TOT = 0.9999e9;
-    eph._ephType = t_eph::LNAV;
+    eph._type = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1159 +1159 @@
     eph._receptStaID = _staID;
 
-    eph._flags_unknown = true;
-
     GETBITS(sv, 6)
     if (sv < 1 || sv > 63) {
@@ -1184 +1182 @@
       return false;
     }
-    eph._frequency_number = i - 7;
+    eph._frq_num = i - 7;
     GETBITS(eph._almanac_health, 1) /* almanac healthy */
     GETBITS(eph._almanac_health_availablility_indicator, 1) /* almanac health ok */
@@ -1245 +1243 @@
     eph._TOC.setTk(i * 60 * 1000); /* tb */
 
-    GETFLOATSIGNM(eph._x_velocity,    24, 1.0 / (double )(1 << 20))
-    GETFLOATSIGNM(eph._x_pos,         27, 1.0 / (double )(1 << 11))
-    GETFLOATSIGNM(eph._x_acceleration, 5, 1.0 / (double )(1 << 30))
-    GETFLOATSIGNM(eph._y_velocity,    24, 1.0 / (double )(1 << 20))
-    GETFLOATSIGNM(eph._y_pos,         27, 1.0 / (double )(1 << 11))
-    GETFLOATSIGNM(eph._y_acceleration, 5, 1.0 / (double )(1 << 30))
-    GETFLOATSIGNM(eph._z_velocity,    24, 1.0 / (double )(1 << 20))
-    GETFLOATSIGNM(eph._z_pos,         27, 1.0 / (double )(1 << 11))
-    GETFLOATSIGNM(eph._z_acceleration, 5, 1.0 / (double )(1 << 30))
+    GETFLOATSIGNM(eph._x_vel, 24, 1.0 / (double )(1 << 20))
+    GETFLOATSIGNM(eph._x_pos, 27, 1.0 / (double )(1 << 11))
+    GETFLOATSIGNM(eph._x_acc,  5, 1.0 / (double )(1 << 30))
+    GETFLOATSIGNM(eph._y_vel, 24, 1.0 / (double )(1 << 20))
+    GETFLOATSIGNM(eph._y_pos, 27, 1.0 / (double )(1 << 11))
+    GETFLOATSIGNM(eph._y_acc,  5, 1.0 / (double )(1 << 30))
+    GETFLOATSIGNM(eph._z_vel, 24, 1.0 / (double )(1 << 20))
+    GETFLOATSIGNM(eph._z_pos, 27, 1.0 / (double )(1 << 11))
+    GETFLOATSIGNM(eph._z_acc,  5, 1.0 / (double )(1 << 30))
     GETBITS(eph._P3, 1)    /* P3 */
     GETFLOATSIGNM(eph._gamma,      11, 1.0 / (double )(1 << 30) / (double )(1 << 10))
@@ -1281 +1279 @@
       return false;
     }
-    GETBITS(eph._NA,  11) /* GLONASS-M Na */
+    GETBITS(eph._M_NA,  11) /* GLONASS-M Na */
     GETFLOATSIGNM(eph._tauC,       32, 1.0/(double)(1<<30)/(double)(1<<1)) /* GLONASS tau c */
     GETBITS(eph._M_N4, 5) /* GLONASS-M N4 */
@@ -1302 +1300 @@
       return false;
     }
-    eph._xv(4) = eph._x_velocity * 1.e3;
-    eph._xv(5) = eph._y_velocity * 1.e3;
-    eph._xv(6) = eph._z_velocity * 1.e3;
+    eph._xv(4) = eph._x_vel * 1.e3;
+    eph._xv(5) = eph._y_vel * 1.e3;
+    eph._xv(6) = eph._z_vel * 1.e3;
     if (eph._xv.Rows(4,6).NormFrobenius() < 1.0) {
 #ifdef BNC_DEBUG_BCE
@@ -1312 +1310 @@
       return false;
     }
-    GLOFreq[sv - 1] = 100 + eph._frequency_number ; /* store frequency for other users (MSM) */
-    _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frequency_number, 2, 'f', 0);
-
-    eph._ephType = t_eph::FDMA;
+    GLOFreq[sv - 1] = 100 + eph._frq_num ; /* store frequency for other users (MSM) */
+    _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frq_num, 2, 'f', 0);
+
+    eph._type = t_eph::FDMA;
+    eph._healthflags_unknown = false;
+    eph._statusflags_unknown = false;
 
     emit newGlonassEph(eph);
@@ -1429 +1429 @@
 
     GETBITS(i, 4)
-    eph._ura = accuracyFromIndex(i, eph.type());
+    eph._ura = accuracyFromIndex(i, eph.system());
     GETBITS(eph._health, 6)
     GETFLOATSIGN(eph._TGD,       8, 1.0 / (double )(1 << 30) / (double )(1 << 1))
     GETBITS(eph._IODC, 10)
     GETBITS(fitIntervalFalg, 1)
-    eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
+    eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.system());
     eph._TOT = 0.9999e9;
-    eph._ephType = t_eph::LNAV;
+    eph._type = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1487 +1487 @@
     GETFLOATSIGN(eph._clock_driftrate, 8, 1.0 / (double )(1 << 30) / (double )(1 << 25))
     GETBITS(i, 4)
-    eph._ura = accuracyFromIndex(i, eph.type());
+    eph._ura = accuracyFromIndex(i, eph.system());
     GETBITS(i, 16)
     i <<= 4;
@@ -1567 +1567 @@
     SKIPBITS(2)
     eph._TOT = 0.9999e9;
-    eph._ephType = t_eph::LNAV;
+    eph._type = t_eph::LNAV;
 
     emit newGPSEph(eph);
@@ -1618 +1618 @@
     eph._TOC.setTOD(i * 1000);
     GETBITS(i, 4)
-    eph._ura = accuracyFromIndex(i, eph.type());
+    eph._ura = accuracyFromIndex(i, eph.system());
     GETFLOATSIGN(eph._x_pos, 30, 0.08)
     GETFLOATSIGN(eph._y_pos, 30, 0.08)
@@ -1631 +1631 @@
       return false;
     }
-    GETFLOATSIGN(eph._x_velocity, 17, 0.000625)
-    GETFLOATSIGN(eph._y_velocity, 17, 0.000625)
-    GETFLOATSIGN(eph._z_velocity, 18, 0.004)
-    GETFLOATSIGN(eph._x_acceleration, 10, 0.0000125)
-    GETFLOATSIGN(eph._y_acceleration, 10, 0.0000125)
-    GETFLOATSIGN(eph._z_acceleration, 10, 0.0000625)
+    GETFLOATSIGN(eph._x_vel, 17, 0.000625)
+    GETFLOATSIGN(eph._y_vel, 17, 0.000625)
+    GETFLOATSIGN(eph._z_vel, 18, 0.004)
+    GETFLOATSIGN(eph._x_acc, 10, 0.0000125)
+    GETFLOATSIGN(eph._y_acc, 10, 0.0000125)
+    GETFLOATSIGN(eph._z_acc, 10, 0.0000625)
     GETFLOATSIGN(eph._agf0, 12, 1.0 / (1 << 30) / (1 << 1))
     GETFLOATSIGN(eph._agf1, 8, 1.0 / (1 << 30) / (1 << 10))
@@ -1642 +1642 @@
     eph._TOT = 0.9999E9;
     eph._health = 0;
-    eph._ephType = t_eph::SBASL1;
+    eph._type = t_eph::SBASL1;
 
     emit newSBASEph(eph);
@@ -1695 +1695 @@
     GETBITS(eph._IODnav, 10)
     GETBITS(i, 8)
-    eph._SISA = accuracyFromIndex(i, eph.type());
+    eph._SISA = accuracyFromIndex(i, eph.system());
     GETFLOATSIGN(eph._IDOT, 14, R2R_PI/(double)(1<<30)/(double)(1<<13))
     GETBITSFACTOR(i, 14, 60)
@@ -1731 +1731 @@
     }
     /* FIXME: overwrite value, copied from old code */
-    eph._TOEsec = eph._TOC.gpssec();
+    //eph._TOEsec = eph._TOC.gpssec();
     GETFLOATSIGN(eph._Cic,      16, 1.0 / (double )(1 << 29))
     GETFLOATSIGN(eph._OMEGA0,   32, R2R_PI/(double)(1<<30)/(double)(1<<1))
@@ -1742 +1742 @@
     if (eph._inav) {
       /* set unused F/NAV values */
-      eph._E5aHS = 0.0;
-      eph._e5aDataInvalid = false;
+      eph._E5a_HS = 0.0;
+      eph._E5a_DataInvalid = false;
 
       GETFLOATSIGN(eph._BGD_1_5B, 10, 1.0 / (double )(1 << 30) / (double )(1 << 2))
-      GETBITS(eph._E5bHS, 2)
-      GETBITS(eph._e5bDataInvalid, 1)
-      GETBITS(eph._E1_bHS, 2)
-      GETBITS(eph._e1DataInvalid, 1)
-      if (eph._E5bHS != eph._E1_bHS) {
+      GETBITS(eph._E5b_HS, 2)
+      GETBITS(eph._E5b_DataInvalid, 1)
+      GETBITS(eph._E1B_HS, 2)
+      GETBITS(eph._E1B_DataInvalid, 1)
+      if (eph._E5b_HS != eph._E1B_HS) {
 #ifdef BNC_DEBUG_BCE
         emit(newMessage(QString("%1: Block %2 (%3) SHS E5b %4 E1B %5: inconsistent health!")
              .arg(_staID).arg(1046,4).arg(eph._prn.toString().c_str())
-             .arg(eph._E5bHS).arg(eph._E1_bHS).toLatin1(), true));
+             .arg(eph._E5b_HS).arg(eph._E1B_HS).toLatin1(), true));
 #endif
         return false;
@@ -1761 +1761 @@
           (eph._BGD_1_5B == 0.0 && fabs(eph._BGD_1_5A) > 1e-9)) {
 #ifdef BNC_DEBUG_BCE
-        emit(newMessage(QString("%1: Block %2 (%3) BGD_15a = %4 BGD_15b = %5: inconsistent BGD!")
+        emit(newMessage(QString("%1: Block %2 (%3) BGD_1_5a = %4 BGD_1_5b = %5: inconsistent BGD!")
              .arg(_staID).arg(1046,4).arg(eph._prn.toString().c_str())
              .arg(eph._BGD_1_5A,10,'E',3).arg(eph._BGD_1_5B,10,'E',3).toLatin1(), true));
@@ -1767 +1767 @@
         return false;
       }
-      eph._ephType = t_eph::INAF;
+      eph._type = t_eph::INAV;
     }
     else {
       /* set unused I/NAV values */
       eph._BGD_1_5B = 0.0;
-      eph._E5bHS = 0.0;
-      eph._E1_bHS = 0.0;
-      eph._e1DataInvalid = false;
-      eph._e5bDataInvalid = false;
-
-      GETBITS(eph._E5aHS, 2)
-      GETBITS(eph._e5aDataInvalid, 1)
-      eph._ephType = t_eph::FNAV;
+      eph._E5b_HS = 0.0;
+      eph._E1B_HS = 0.0;
+      eph._E1B_DataInvalid = false;
+      eph._E5b_DataInvalid = false;
+
+      GETBITS(eph._E5a_HS, 2)
+      GETBITS(eph._E5a_DataInvalid, 1)
+      eph._type = t_eph::FNAV;
     }
     eph._TOT = 0.9999e9;
@@ -1841 +1841 @@
     eph._BDTweek = week;
     GETBITS(i, 4)
-    eph._URA = accuracyFromIndex(i, eph.type());
+    eph._ura = accuracyFromIndex(i, eph.system());
     GETFLOATSIGN(eph._IDOT, 14, R2R_PI/(double)(1<<30)/(double)(1<<13))
     GETBITS(eph._AODE, 5)
@@ -1903 +1903 @@
     eph._TOT = 0.9999E9;
     if (eph._i0 > iMaxGEO) {
-      eph._ephType = t_eph::D1;
+      eph._type = t_eph::D1;
     }
     else {
-      eph._ephType = t_eph::D2;
+      eph._type = t_eph::D2;
     }
 

trunk/BNC/src/RTCM3/ephEncoder.cpp

@@ -14 +14 @@
   int numbits = 0;
   unsigned long long bitbuffer = 0;
-  int ura = indexFromAccuracy(eph._ura, eph.type());
+  int ura = indexFromAccuracy(eph._ura, eph.system());
   int L5Flag = 0;
   int SFlag = 0;
   int fitIntervalFlag = 0;
 
-  if (eph.type() == t_eph::QZSS) {
+  if (eph.system() == t_eph::QZSS) {
     GPSADDBITS(12, 1044)
     GPSADDBITS(4, eph._prn.number())
@@ -52 +52 @@
     GPSADDBITS(1, fitIntervalFlag)
     GPSADDBITS(3, 0) /* padding */
-  } else if (eph.type() == t_eph::IRNSS) {
+  } else if (eph.system() == t_eph::IRNSS) {
     GPSADDBITS(12, 1041)
     GPSADDBITS(6, eph._prn.number())
@@ -156 +156 @@
   GLONASSADDBITS(12, 1020)
   GLONASSADDBITS(6, eph._prn.number())
-  GLONASSADDBITS(5, 7+eph._frequency_number)
+  GLONASSADDBITS(5, 7+eph._frq_num)
   GLONASSADDBITS(1, eph._almanac_health)
   GLONASSADDBITS(1, eph._almanac_health_availablility_indicator)
@@ -169 +169 @@
   unsigned long long timeofday = (static_cast<int>(eph._tt.gpssec()+3*60*60-eph._gps_utc)%86400);
   GLONASSADDBITS(7, timeofday/60/15)
-  GLONASSADDBITSFLOATM(24, eph._x_velocity*1000, 1000.0/static_cast<double>(1<<20))
+  GLONASSADDBITSFLOATM(24, eph._x_vel*1000, 1000.0/static_cast<double>(1<<20))
   GLONASSADDBITSFLOATM(27, eph._x_pos*1000, 1000.0/static_cast<double>(1<<11))
-  GLONASSADDBITSFLOATM(5, eph._x_acceleration*1000, 1000.0/static_cast<double>(1<<30))
-  GLONASSADDBITSFLOATM(24, eph._y_velocity*1000, 1000.0/static_cast<double>(1<<20))
+  GLONASSADDBITSFLOATM(5, eph._x_acc*1000, 1000.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(24, eph._y_vel*1000, 1000.0/static_cast<double>(1<<20))
   GLONASSADDBITSFLOATM(27, eph._y_pos*1000, 1000.0/static_cast<double>(1<<11))
-  GLONASSADDBITSFLOATM(5, eph._y_acceleration*1000, 1000.0/static_cast<double>(1<<30))
-  GLONASSADDBITSFLOATM(24, eph._z_velocity*1000, 1000.0/static_cast<double>(1<<20))
+  GLONASSADDBITSFLOATM(5, eph._y_acc*1000, 1000.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(24, eph._z_vel*1000, 1000.0/static_cast<double>(1<<20))
   GLONASSADDBITSFLOATM(27,eph._z_pos*1000, 1000.0/static_cast<double>(1<<11))
-  GLONASSADDBITSFLOATM(5, eph._z_acceleration*1000, 1000.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(5, eph._z_acc*1000, 1000.0/static_cast<double>(1<<30))
   GLONASSADDBITS(1, eph._P3)
   GLONASSADDBITSFLOATM(11, eph._gamma, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<10))
@@ -190 +190 @@
   GLONASSADDBITS(2, eph._M_M) /* GLONASS-M active? */
   GLONASSADDBITS(1, eph._additional_data_availability) /* GLONASS additional data */
-  GLONASSADDBITS(11, eph._NA) /* GLONASS NA */
+  GLONASSADDBITS(11, eph._M_NA) /* GLONASS NA */
   GLONASSADDBITSFLOATM(32, eph._tauC, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1)) /* GLONASS tau C */
   GLONASSADDBITS(5, eph._M_N4) /* GLONASS-M N4 */
@@ -217 +217 @@
   buffer= buffer+3;
 
-  int SISA = indexFromAccuracy(eph._SISA, eph.type());
+  int SISA = indexFromAccuracy(eph._SISA, eph.system());
 
   GALILEOADDBITS(12, eph._inav ? 1046 : 1045)
@@ -247 +247 @@
   if(eph._inav) {
     GALILEOADDBITSFLOAT(10, eph._BGD_1_5B, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<2))
-    GALILEOADDBITS(2, static_cast<int>(eph._E5bHS))
-    GALILEOADDBITS(1, eph._e5bDataInvalid ? 1 : 0)
-    GALILEOADDBITS(2, static_cast<int>(eph._E1_bHS))
-    GALILEOADDBITS(1, eph._e1DataInvalid ? 1 : 0)
+    GALILEOADDBITS(2, static_cast<int>(eph._E5b_HS))
+    GALILEOADDBITS(1, eph._E5b_DataInvalid ? 1 : 0)
+    GALILEOADDBITS(2, static_cast<int>(eph._E1B_HS))
+    GALILEOADDBITS(1, eph._E1B_DataInvalid ? 1 : 0)
   } else {
-    GALILEOADDBITS(2, static_cast<int>(eph._E5aHS))
-    GALILEOADDBITS(1,  eph._e5aDataInvalid ? 1 : 0)
+    GALILEOADDBITS(2, static_cast<int>(eph._E5a_HS))
+    GALILEOADDBITS(1,  eph._E5a_DataInvalid ? 1 : 0)
   }
 
@@ -278 +278 @@
   buffer= buffer+3;
 
-  int ura = indexFromAccuracy(eph._ura, eph.type());
+  int ura = indexFromAccuracy(eph._ura, eph.system());
   SBASADDBITS(12, 1043)
   SBASADDBITS(6, eph._prn.number()-20)
@@ -287 +287 @@
   SBASADDBITSFLOAT(30, eph._y_pos, 0.08)
   SBASADDBITSFLOAT(25, eph._z_pos, 0.4)
-  SBASADDBITSFLOAT(17, eph._x_velocity, 0.000625)
-  SBASADDBITSFLOAT(17, eph._y_velocity, 0.000625)
-  SBASADDBITSFLOAT(18, eph._z_velocity, 0.004)
-  SBASADDBITSFLOAT(10, eph._x_acceleration, 0.0000125)
-  SBASADDBITSFLOAT(10, eph._y_acceleration, 0.0000125)
-  SBASADDBITSFLOAT(10, eph._z_acceleration, 0.0000625)
+  SBASADDBITSFLOAT(17, eph._x_vel, 0.000625)
+  SBASADDBITSFLOAT(17, eph._y_vel, 0.000625)
+  SBASADDBITSFLOAT(18, eph._z_vel, 0.004)
+  SBASADDBITSFLOAT(10, eph._x_acc, 0.0000125)
+  SBASADDBITSFLOAT(10, eph._y_acc, 0.0000125)
+  SBASADDBITSFLOAT(10, eph._z_acc, 0.0000625)
   SBASADDBITSFLOAT(12, eph._agf0, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1))
   SBASADDBITSFLOAT(8, eph._agf1, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<10))
@@ -317 +317 @@
   buffer= buffer+3;
 
-  int URA = indexFromAccuracy(eph._URA, eph.type());
+  int URAI = indexFromAccuracy(eph._ura, eph.system());
   BDSADDBITS(12, 1042)
   BDSADDBITS(6, eph._prn.number())
   BDSADDBITS(13, eph._TOC.bdsw())
-  BDSADDBITS(4, URA);
+  BDSADDBITS(4, URAI);
   BDSADDBITSFLOAT(14, eph._IDOT, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<13))
   BDSADDBITS(5, eph._AODE)