Changeset 8983 in ntrip for trunk

Timestamp:

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

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (modified) (2 diffs)

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -621 +621 @@
         else if (prn.system() == 'C') {
           biasSat = bias.Sat + CLOCKORBIT_NUMGPS + CLOCKORBIT_NUMGLONASS
-                  + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS 
+                  + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
                   + CLOCKORBIT_NUMSBAS
                   + bias.NumberOfSat[CLOCKORBIT_SATBDS];
@@ -1417 +1417 @@
       // ------------
       struct PhaseBias::PhaseBiasSat* phasebiasSat = 0;
-//      if (!phaseBiasList.isEmpty()) { // to allow yaw angle without phase bias list
-        if (prn.system() == 'G') {
+        if (prn.system()      == 'G') {
           phasebiasSat = phasebias.Sat
-              + phasebias.NumberOfSat[CLOCKORBIT_SATGPS];
+                       + phasebias.NumberOfSat[CLOCKORBIT_SATGPS];
           ++phasebias.NumberOfSat[CLOCKORBIT_SATGPS];
         }
         else if (prn.system() == 'R') {
           phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS
-              + phasebias.NumberOfSat[CLOCKORBIT_SATGLONASS];
+                       + phasebias.NumberOfSat[CLOCKORBIT_SATGLONASS];
           ++phasebias.NumberOfSat[CLOCKORBIT_SATGLONASS];
         }
         else if (prn.system() == 'E') {
           phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS
-              + phasebias.NumberOfSat[CLOCKORBIT_SATGALILEO];
+                       + phasebias.NumberOfSat[CLOCKORBIT_SATGALILEO];
           ++phasebias.NumberOfSat[CLOCKORBIT_SATGALILEO];
         }
         else if (prn.system() == 'J') {
           phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS
-                               + CLOCKORBIT_NUMGALILEO
+                       + CLOCKORBIT_NUMGALILEO
                        + phasebias.NumberOfSat[CLOCKORBIT_SATQZSS];
           ++phasebias.NumberOfSat[CLOCKORBIT_SATQZSS];
         }
+        else if (prn.system() == 'S') {
+          phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS
+                       + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
+                       + phasebias.NumberOfSat[CLOCKORBIT_SATSBAS];
+          ++phasebias.NumberOfSat[CLOCKORBIT_SATSBAS];
+        }
         else if (prn.system() == 'C') {
           phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS
-                               + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
+                       + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS
+                       + CLOCKORBIT_NUMSBAS
                        + phasebias.NumberOfSat[CLOCKORBIT_SATBDS];
           ++phasebias.NumberOfSat[CLOCKORBIT_SATBDS];
         }
-        else if (prn.system() == 'S') {
-          phasebiasSat = phasebias.Sat + CLOCKORBIT_NUMGPS  + CLOCKORBIT_NUMGLONASS
-                               + CLOCKORBIT_NUMGALILEO + CLOCKORBIT_NUMQZSS + CLOCKORBIT_NUMBDS
-                                           + phasebias.NumberOfSat[CLOCKORBIT_SATSBAS];
-          ++phasebias.NumberOfSat[CLOCKORBIT_SATSBAS];
-        }
-      //}
 
       if (phasebiasSat) {