Changeset 8313 in ntrip

Timestamp:

Mar 28, 2018, 9:36:57 AM (6 years ago)

Author:

stuerze

Message:

the latest changes regarding SSR Satellite ID for BDS and SBAS are reverted because it is planned to prevent zero for these SSR Satellite IDs

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (4 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (3 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -275 +275 @@
 
       t_orbCorr orbCorr;
-      int satID = _clkOrb.Sat[ii].ID;
-      if (sysCh == 'C' || sysCh == 'S') {
-        satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
-      }
-      orbCorr._prn.set(sysCh, satID, flag);
+      orbCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID, flag);
       orbCorr._staID     = _staID.toStdString();
       orbCorr._iod       = _clkOrb.Sat[ii].IOD;
@@ -313 +309 @@
 
       t_clkCorr clkCorr;
-      int satID = _clkOrb.Sat[ii].ID;
-      if (sysCh == 'C' || sysCh == 'S') {
-        satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
-      }
-      clkCorr._prn.set(sysCh, satID, flag);
+      clkCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID, flag);
       clkCorr._staID      = _staID.toStdString();
       clkCorr._time       = _lastTime;
@@ -393 +385 @@
     }
     t_satCodeBias satCodeBias;
-    int satID = _codeBias.Sat[ii].ID;
-    if (sysCh == 'C' || sysCh == 'S') {
-      satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
-    }
-    satCodeBias._prn.set(sysCh, satID);
+    satCodeBias._prn.set(sysCh, _codeBias.Sat[ii].ID);
     satCodeBias._staID     = _staID.toStdString();
     satCodeBias._time      = _lastTime;
@@ -450 +438 @@
     }
     t_satPhaseBias satPhaseBias;
-    int satID = _phaseBias.Sat[ii].ID;
-    if (sysCh == 'C' || sysCh == 'S') {
-      satID++;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
-    }
-    satPhaseBias._prn.set(sysCh, satID);
+    satPhaseBias._prn.set(sysCh, _phaseBias.Sat[ii].ID);
     satPhaseBias._staID      = _staID.toStdString();
     satPhaseBias._time       = _lastTime;

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -601 +601 @@
       if (biasSat) {
         biasSat->ID = prn.number();
-        if (prn.system() == 'C' ||
-            prn.system() == 'S') {
-          biasSat->ID--; // DF463 and DF466 with DF range 0-63, first satellite shall be 0
-        }
         biasSat->NumberOfCodeBiases = 0;
         if (prn.system() == 'G') {
@@ -1208 +1204 @@
         phasebias.MWConsistencyIndicator = mwConsistencyIndicator;
         phasebiasSat->ID = prn.number();
-        if (prn.system() == 'C' ||
-            prn.system() == 'S') {
-          phasebiasSat->ID--; // DF463 and DF466 with DF range 0-63, first satellite shall be 0
-        }
         phasebiasSat->NumberOfPhaseBiases = 0;
         phasebiasSat->YawAngle = pbSat.yawAngle;
@@ -2338 +2330 @@
   if (sd) {
     sd->ID = prn.mid(1).toInt();
-    char sys =  prn.mid(0,1).at(0).toLatin1();
-    if ( sys == 'C' || 
-         sys == 'S') {
-      sd->ID--;// DF463 and DF466 with DF range 0-63, first satellite shall be 0
-    }
     sd->IOD = eph->IOD();
     sd->Clock.DeltaA0 = dClk;