Changeset 8840 in ntrip


Ignore:
Timestamp:
Nov 5, 2019, 2:40:34 PM (5 months 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.cpp

    r8628 r8840  
    793793      case CODETYPE_BDS_B2_Q:         return "7Q";
    794794      case CODETYPE_BDS_B2_IQ:        return "7X";
    795       case CODETYPE_BDS_B1a_D:        return "1D";
    796       case CODETYPE_BDS_B1a_P:        return "1P";
    797       case CODETYPE_BDS_B1a_DP:       return "1X";
    798       case CODETYPE_BDS_B2a_D:        return "2D";
    799       case CODETYPE_BDS_B2a_P:        return "2P";
    800       case CODETYPE_BDS_B2a_DP:       return "2X";
     795      case CODETYPE_BDS_B2a_D:        return "1D";
     796      case CODETYPE_BDS_B2a_P:        return "1P";
     797      case CODETYPE_BDS_B2a_DP:       return "1X";
     798      case CODETYPE_BDS_B1C_D:        return "5D";
     799      case CODETYPE_BDS_B1C_P:        return "5P";
     800      case CODETYPE_BDS_B1C_DP:       return "5X";
    801801      default: return "";
    802802    }
  • branches/BNC_2.12/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h

    r8820 r8840  
    231231  CODETYPE_BDS_B2_Q          = 7,
    232232  CODETYPE_BDS_B2_IQ         = 8,
    233   CODETYPE_BDS_B1a_D         = 9,
    234   CODETYPE_BDS_B1a_P         = 10,
    235   CODETYPE_BDS_B1a_DP        = 11,
    236   CODETYPE_BDS_B2a_D         = 12,
    237   CODETYPE_BDS_B2a_P         = 13,
    238   CODETYPE_BDS_B2a_DP        = 14,
     233  CODETYPE_BDS_B2a_D         = 9,
     234  CODETYPE_BDS_B2a_P         = 10,
     235  CODETYPE_BDS_B2a_DP        = 11,
     236  CODETYPE_BDS_B1C_D         = 12,
     237  CODETYPE_BDS_B1C_P         = 13,
     238  CODETYPE_BDS_B1C_DP        = 14,
    239239
    240240  CODETYPE_IRNSS_S_SPS       = 8,
  • branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

    r8807 r8840  
    13031303                break;
    13041304              biasSat->NumberOfCodeBiases += 1;
    1305               biasSat->Biases[ii].Type = CODETYPE_BDS_B1a_D;
     1305              biasSat->Biases[ii].Type = CODETYPE_BDS_B1C_D;
    13061306              biasSat->Biases[ii].Bias = it.value();
    13071307            }
     
    13111311                break;
    13121312              biasSat->NumberOfCodeBiases += 1;
    1313               biasSat->Biases[ii].Type = CODETYPE_BDS_B1a_P;
     1313              biasSat->Biases[ii].Type = CODETYPE_BDS_B1C_P;
    13141314              biasSat->Biases[ii].Bias = it.value();
    13151315            }
     
    13191319                break;
    13201320              biasSat->NumberOfCodeBiases += 1;
    1321               biasSat->Biases[ii].Type = CODETYPE_BDS_B1a_DP;
     1321              biasSat->Biases[ii].Type = CODETYPE_BDS_B1C_DP;
    13221322              biasSat->Biases[ii].Bias = it.value();
    13231323            }
     
    23122312                break;
    23132313              phasebiasSat->NumberOfPhaseBiases += 1;
    2314               phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1a_D;
     2314              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1C_D;
    23152315              phasebiasSat->Biases[ii].Bias = pbSig.bias;
    23162316              phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;
     
    23222322                break;
    23232323              phasebiasSat->NumberOfPhaseBiases += 1;
    2324               phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1a_P;
     2324              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1C_P;
    23252325              phasebiasSat->Biases[ii].Bias = pbSig.bias;
    23262326              phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;
     
    23322332                break;
    23332333              phasebiasSat->NumberOfPhaseBiases += 1;
    2334               phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1a_DP;
     2334              phasebiasSat->Biases[ii].Type = CODETYPE_BDS_B1C_DP;
    23352335              phasebiasSat->Biases[ii].Bias = pbSig.bias;
    23362336              phasebiasSat->Biases[ii].SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;
Note: See TracChangeset for help on using the changeset viewer.