Changeset 8982 in ntrip for trunk

Timestamp:

Jul 20, 2020, 1:03:47 PM (4 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• RTCM3/clock_and_orbit/clock_orbit_rtcm.h (modified) (3 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (6 diffs)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

@@ -183 +183 @@
   CODETYPEGLONASS_L3_IQ      = 12,
 
-
   CODETYPEGALILEO_E1_A       = 0,
   CODETYPEGALILEO_E1_B       = 1,
@@ -224 +223 @@
   CODETYPEQZSS_L6_DE         = 18,
 
+  CODETYPE_SBAS_L1_CA        = 0,
+  CODETYPE_SBAS_L5_I         = 1,
+  CODETYPE_SBAS_L5_Q         = 2,
+  CODETYPE_SBAS_L5_IQ        = 3,
+
   CODETYPE_BDS_B1_I          = 0,
   CODETYPE_BDS_B1_Q          = 1,
@@ -238 +242 @@
   CODETYPE_BDS_B2a_D         = 12,
   CODETYPE_BDS_B2a_P         = 13,
-  CODETYPE_BDS_B2a_DP        = 14,
-
-  CODETYPE_SBAS_L1_CA        = 0,
-  CODETYPE_SBAS_L5_I         = 1,
-  CODETYPE_SBAS_L5_Q         = 2,
-  CODETYPE_SBAS_L5_IQ        = 3
-
+  CODETYPE_BDS_B2a_DP        = 14
 };
 

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -263 +263 @@
     QString rtnetStreamBuffer = _rtnetStreamBuffer.mid(1);
     int nextEpoch = rtnetStreamBuffer.indexOf('*');
-    if (nextEpoch != -1 && nextEpoch < iEpoEnd) {
+    if      (nextEpoch != -1 && nextEpoch < iEpoEnd) {
       _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
     }
@@ -274 +274 @@
       QString::SkipEmptyParts);
   _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
-
 
   if (lines.size() < 2) {
@@ -546 +545 @@
       }
 
-
       struct ClockOrbit::SatData* sd = 0;
       if (prn.system() == 'G') {
@@ -564 +562 @@
         sd = co.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
            + CLOCKORBIT_NUMGALILEO
-                   + co.NumberOfSat[CLOCKORBIT_SATQZSS];
+           + co.NumberOfSat[CLOCKORBIT_SATQZSS];
         ++co.NumberOfSat[CLOCKORBIT_SATQZSS];
       }
@@ -606 +604 @@
         else if (prn.system() == 'E') {
           biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
-                   + bias.NumberOfSat[CLOCKORBIT_SATGALILEO];
+                  + bias.NumberOfSat[CLOCKORBIT_SATGALILEO];
           ++bias.NumberOfSat[CLOCKORBIT_SATGALILEO];
         }
@@ -612 +610 @@
           biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
                   + CLOCKORBIT_NUMGALILEO
-                              + bias.NumberOfSat[CLOCKORBIT_SATQZSS];
+                  + bias.NumberOfSat[CLOCKORBIT_SATQZSS];
           ++bias.NumberOfSat[CLOCKORBIT_SATQZSS];
+        }
+        else if (prn.system() == 'S') {
+          biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
+                  + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
+                  + bias.NumberOfSat[CLOCKORBIT_SATSBAS];
+          ++bias.NumberOfSat[CLOCKORBIT_SATSBAS];
         }
         else if (prn.system() == 'C') {
           biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
-                   + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
-                   + bias.NumberOfSat[CLOCKORBIT_SATBDS];
+                  + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS 
+                  + CLOCKORBIT_NUMSBAS
+                  + bias.NumberOfSat[CLOCKORBIT_SATBDS];
           ++bias.NumberOfSat[CLOCKORBIT_SATBDS];
-        }
-        else if (prn.system() == 'S') {
-          biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
-                  + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMBDS
-                  + bias.NumberOfSat[CLOCKORBIT_SATSBAS];
-          ++bias.NumberOfSat[CLOCKORBIT_SATSBAS];
         }
       }