Changeset 8840 in ntrip for branches/BNC_2.12

Timestamp:

Nov 5, 2019, 2:40:34 PM (5 years ago)

Author:

stuerze

Message:

update with respect to BDS signal mapping IDs as far as consistent with RINEX v3.04

Location:

branches/BNC_2.12/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• RTCM3/clock_and_orbit/clock_orbit_rtcm.h (modified) (1 diff)
• upload/bncrtnetuploadcaster.cpp (modified) (6 diffs)

branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.cpp

@@ -793 +793 @@
       case CODETYPE_BDS_B2_Q:         return "7Q";
       case CODETYPE_BDS_B2_IQ:        return "7X";
-      case CODETYPE_BDS_B1a_D:        return "1D";
-      case CODETYPE_BDS_B1a_P:        return "1P";
-      case CODETYPE_BDS_B1a_DP:       return "1X";
-      case CODETYPE_BDS_B2a_D:        return "2D";
-      case CODETYPE_BDS_B2a_P:        return "2P";
-      case CODETYPE_BDS_B2a_DP:       return "2X";
+      case CODETYPE_BDS_B2a_D:        return "1D";
+      case CODETYPE_BDS_B2a_P:        return "1P";
+      case CODETYPE_BDS_B2a_DP:       return "1X";
+      case CODETYPE_BDS_B1C_D:        return "5D";
+      case CODETYPE_BDS_B1C_P:        return "5P";
+      case CODETYPE_BDS_B1C_DP:       return "5X";
       default: return "";
     }

branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

@@ -231 +231 @@
   CODETYPE_BDS_B2_Q          = 7,
   CODETYPE_BDS_B2_IQ         = 8,
-  CODETYPE_BDS_B1a_D         = 9,
-  CODETYPE_BDS_B1a_P         = 10,
-  CODETYPE_BDS_B1a_DP        = 11,
-  CODETYPE_BDS_B2a_D         = 12,
-  CODETYPE_BDS_B2a_P         = 13,
-  CODETYPE_BDS_B2a_DP        = 14,
+  CODETYPE_BDS_B2a_D         = 9,
+  CODETYPE_BDS_B2a_P         = 10,
+  CODETYPE_BDS_B2a_DP        = 11,
+  CODETYPE_BDS_B1C_D         = 12,
+  CODETYPE_BDS_B1C_P         = 13,
+  CODETYPE_BDS_B1C_DP        = 14,
 
   CODETYPE_IRNSS_S_SPS       = 8,

branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

@@ -1303 +1303 @@
                 break;
               biasSat->NumberOfCodeBiases += 1;
-              biasSat->Biases[ii].Type = CODETYPE_BDS_B1a_D;
+              biasSat->Biases[ii].Type = CODETYPE_BDS_B1C_D;
               biasSat->Biases[ii].Bias = it.value();
             }
@@ -1311 +1311 @@
                 break;
               biasSat->NumberOfCodeBiases += 1;
-              biasSat->Biases[ii].Type = CODETYPE_BDS_B1a_P;
+              biasSat->Biases[ii].Type = CODETYPE_BDS_B1C_P;
               biasSat->Biases[ii].Bias = it.value();
             }
@@ -1319 +1319 @@
                 break;
               biasSat->NumberOfCodeBiases += 1;
-              biasSat->Biases[ii].Type = CODETYPE_BDS_B1a_DP;
+              biasSat->Biases[ii].Type = CODETYPE_BDS_B1C_DP;
               biasSat->Biases[ii].Bias = it.value();
             }
@@ -2312 +2312 @@
                 break;
               phasebiasSat->NumberOfPhaseBiases += 1;
-              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1a_D;
+              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1C_D;
               phasebiasSat->Biases[ii].Bias = pbSig.bias;
               phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;
@@ -2322 +2322 @@
                 break;
               phasebiasSat->NumberOfPhaseBiases += 1;
-              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1a_P;
+              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1C_P;
               phasebiasSat->Biases[ii].Bias = pbSig.bias;
               phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;
@@ -2332 +2332 @@
                 break;
               phasebiasSat->NumberOfPhaseBiases += 1;
-              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1a_DP;
+              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1C_DP;
               phasebiasSat->Biases[ii].Bias = pbSig.bias;
               phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;