Changeset 10599 in ntrip for trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

Timestamp:

Jan 31, 2025, 10:30:08 AM (11 days ago)

Author:

stuerze

Message:

ADDED: consideration of NAV type in all applications

File:

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

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -71 +71 @@
   _rawFile = rawFile;
 
-  connect(this, SIGNAL(newGPSEph(t_ephGPS)), BNC_CORE,
-      SLOT(slotNewGPSEph(t_ephGPS)));
-  connect(this, SIGNAL(newGlonassEph(t_ephGlo)), BNC_CORE,
-      SLOT(slotNewGlonassEph(t_ephGlo)));
-  connect(this, SIGNAL(newGalileoEph(t_ephGal)), BNC_CORE,
-      SLOT(slotNewGalileoEph(t_ephGal)));
-  connect(this, SIGNAL(newSBASEph(t_ephSBAS)), BNC_CORE,
-      SLOT(slotNewSBASEph(t_ephSBAS)));
-  connect(this, SIGNAL(newBDSEph(t_ephBDS)), BNC_CORE,
-      SLOT(slotNewBDSEph(t_ephBDS)));
+  connect(this, SIGNAL(newGPSEph(t_ephGPS)),     BNC_CORE, SLOT(slotNewGPSEph(t_ephGPS)));
+  connect(this, SIGNAL(newGlonassEph(t_ephGlo)), BNC_CORE, SLOT(slotNewGlonassEph(t_ephGlo)));
+  connect(this, SIGNAL(newGalileoEph(t_ephGal)), BNC_CORE, SLOT(slotNewGalileoEph(t_ephGal)));
+  connect(this, SIGNAL(newSBASEph(t_ephSBAS)),   BNC_CORE, SLOT(slotNewSBASEph(t_ephSBAS)));
+  connect(this, SIGNAL(newBDSEph(t_ephBDS)),     BNC_CORE, SLOT(slotNewBDSEph(t_ephBDS)));
 
   _MessageSize = _SkipBytes = _BlockSize = _NeedBytes = 0;
@@ -134 +129 @@
 
     GETBITS(sv, 6)
-    if (sv < 40)
-      CurrentObs._prn.set('G', sv);
-    else
-      CurrentObs._prn.set('S', sv - 20);
+    char sys;
+    int num, flag;
+    if (sv < 40) {
+      sys = 'G';
+      num = sv;
+    }
+    else {
+      sys = 'S';
+      num = sv - 20;
+    }
+    flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
+    CurrentObs._prn.set(sys, num, flag);
 
     t_frqObs *frqObs = new t_frqObs;
@@ -706 +709 @@
             /* next satellite */
             ;
-          if (CurrentObs._obs.size() > 0)
+          if (CurrentObs._obs.size() > 0) {
+            char sys = CurrentObs._prn.system();
+            int  num = CurrentObs._prn.number();
+            int flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
+            CurrentObs._prn.setFlag(flag);
             _CurrentObsList.push_back(CurrentObs);
+          }
           CurrentObs.clear();
           CurrentObs._time = CurrentObsTime;
@@ -882 +890 @@
       }
       if (CurrentObs._obs.size() > 0) {
+        char sys = CurrentObs._prn.system();
+        int  num = CurrentObs._prn.number();
+        int flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
+        CurrentObs._prn.setFlag(flag);
         _CurrentObsList.push_back(CurrentObs);
       }
@@ -939 +951 @@
 
     GETBITS(sv, 6)
-    CurrentObs._prn.set('R', sv);
+    char sys = 'R';
+    int flag = t_corrSSR::getSsrNavTypeFlag(sys, sv);
+    CurrentObs._prn.set(sys, sv, flag);
     GETBITS(code, 1)
     GETBITS(freq, 5)
@@ -1135 +1149 @@
     eph._TOT = 0.9999e9;
     eph._type = t_eph::LNAV;
+    eph._prn.setFlag(eph._type);
 
     emit newGPSEph(eph);
@@ -1313 +1328 @@
     _gloFrq = QString("%1 %2").arg(eph._prn.toString().c_str()).arg(eph._frq_num, 2, 'f', 0);
 
-    eph._type = t_eph::FDMA;
+    if (eph.validMdata()) {
+      eph._type = t_eph::FDMA_M;
+    }
+    else {
+      eph._type = t_eph::FDMA;
+    }
+    eph._prn.setFlag(eph._type);
     eph._healthflags_unknown = false;
     eph._statusflags_unknown = false;
@@ -1568 +1589 @@
     eph._TOT = 0.9999e9;
     eph._type = t_eph::LNAV;
+    eph._prn.setFlag(eph._type);
 
     emit newGPSEph(eph);
@@ -1643 +1665 @@
     eph._health = 0;
     eph._type = t_eph::SBASL1;
+    eph._prn.setFlag(eph._type);
 
     emit newSBASEph(eph);
@@ -1661 +1684 @@
   GETBITS(i, 12)
 
-  if ((i == 1046 && size == 61) || (i == 1045 && size == 60)) {
+  if ((i == 1046 && size == 61) ||
+      (i == 1045 && size == 60)) {
     t_ephGal eph;
     eph._receptDateTime = currentDateAndTimeGPS();
@@ -1679 +1703 @@
       return false;
     }
-    eph._prn.set('E', i, eph._inav ? 1 : 0);
+    eph._prn.set('E', i, eph._inav ? t_eph::INAV : t_eph::FNAV);
 
     GETBITS(week, 12) //FIXME: roll-over after week 4095!!
@@ -1741 +1765 @@
     GETFLOATSIGN(eph._BGD_1_5A, 10, 1.0 / (double )(1 << 30) / (double )(1 << 2))
     if (eph._inav) {
+      eph._type = t_eph::INAV;
       /* set unused F/NAV values */
       eph._E5a_HS = 0.0;
@@ -1767 +1792 @@
         return false;
       }
-      eph._type = t_eph::INAV;
     }
     else {
+      eph._type = t_eph::FNAV;
       /* set unused I/NAV values */
       eph._BGD_1_5B = 0.0;
@@ -1779 +1804 @@
       GETBITS(eph._E5a_HS, 2)
       GETBITS(eph._E5a_DataInvalid, 1)
-      eph._type = t_eph::FNAV;
     }
     eph._TOT = 0.9999e9;
@@ -1908 +1932 @@
       eph._type = t_eph::D2;
     }
+    eph._prn.setFlag(eph._type);
 
     emit newBDSEph(eph);