Changeset 8629 in ntrip
 Timestamp:
 Mar 13, 2019, 7:43:18 AM (21 months ago)
 Location:
 trunk/BNC/src
 Files:

 5 edited
Legend:
 Unmodified
 Added
 Removed

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp
r8617 r8629 713 713 case CODETYPEGLONASS_L1_CA: return "1C"; 714 714 case CODETYPEGLONASS_L1_P: return "1P"; 715 716 case CODETYPEGLONASS_L1a_OCd: return "1A";717 case CODETYPEGLONASS_L1a_OCp: return "1B";718 case CODETYPEGLONASS_L1a_OCdp: return "1X";719 720 715 case CODETYPEGLONASS_L2_CA: return "2C"; 721 716 case CODETYPEGLONASS_L2_P: return "2P"; 722 case CODETYPEGLONASS_L2a_CSI: return "1A"; 723 case CODETYPEGLONASS_L2a_OCp: return "1B"; 724 case CODETYPEGLONASS_L2a_CSIOCp:return "1X"; 725 717 case CODETYPEGLONASS_L1a_OCd: return "4A"; 718 case CODETYPEGLONASS_L1a_OCp: return "4B"; 719 case CODETYPEGLONASS_L1a_OCdp: return "4X"; 720 case CODETYPEGLONASS_L2a_CSI: return "6A"; 721 case CODETYPEGLONASS_L2a_OCp: return "6B"; 722 case CODETYPEGLONASS_L2a_CSIOCp:return "6X"; 726 723 case CODETYPEGLONASS_L3_I: return "3I"; 727 724 case CODETYPEGLONASS_L3_Q: return "3Q"; … … 763 760 case CODETYPEQZSS_L1C_D: return "1S"; 764 761 case CODETYPEQZSS_L1C_P: return "1L"; 765 case CODETYPEQZSS_L1C_DP: return "1X";766 767 762 case CODETYPEQZSS_L2C_M: return "2S"; 768 763 case CODETYPEQZSS_L2C_L: return "2L"; 769 764 case CODETYPEQZSS_L2C_ML: return "2X"; 770 771 765 case CODETYPEQZSS_L5_I: return "5I"; 772 766 case CODETYPEQZSS_L5_Q: return "5Q"; 773 767 case CODETYPEQZSS_L5_IQ: return "5X"; 774 775 768 case CODETYPEQZSS_L6_D: return "6S"; 776 769 case CODETYPEQZSS_L6_P: return "6L"; 777 770 case CODETYPEQZSS_L6_DP: return "6X"; 778 case CODETYPEQZSS_L6E: return "6E"; 779 771 case CODETYPEQZSS_L1C_DP: return "1X"; 772 case CODETYPEQZSS_L1_S: return "1Z"; 773 case CODETYPEQZSS_L5_D: return "5D"; 774 case CODETYPEQZSS_L5_P: return "5P"; 775 case CODETYPEQZSS_L5_DP: return "5Z"; 776 case CODETYPEQZSS_L6_E: return "6E"; 777 case CODETYPEQZSS_L6_DE: return "6Z"; 780 778 default: return ""; 781 779 } … … 796 794 case CODETYPE_BDS_B1_Q: return "2Q"; 797 795 case CODETYPE_BDS_B1_IQ: return "2X"; 798 796 case CODETYPE_BDS_B3_I: return "6I"; 797 case CODETYPE_BDS_B3_Q: return "6Q"; 798 case CODETYPE_BDS_B3_IQ: return "6X"; 799 799 case CODETYPE_BDS_B2_I: return "7I"; 800 800 case CODETYPE_BDS_B2_Q: return "7Q"; 801 801 case CODETYPE_BDS_B2_IQ: return "7X"; 802 803 case CODETYPE_BDS_B3_I: return "6I"; 804 case CODETYPE_BDS_B3_Q: return "6Q"; 805 case CODETYPE_BDS_B3_IQ: return "6X"; 802 case CODETYPE_BDS_B1a_D: return "1D"; 803 case CODETYPE_BDS_B1a_P: return "1P"; 804 case CODETYPE_BDS_B1a_DP: return "1X"; 805 case CODETYPE_BDS_B2a_D: return "2D"; 806 case CODETYPE_BDS_B2a_P: return "2P"; 807 case CODETYPE_BDS_B2a_DP: return "2X"; 806 808 default: return ""; 807 809 } 
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h
r8409 r8629 210 210 CODETYPEQZSS_L6_DP = 11, 211 211 CODETYPEQZSS_L1C_DP = 12, 212 CODETYPEQZSS_L1 S= 13,212 CODETYPEQZSS_L1_S = 13, 213 213 CODETYPEQZSS_L5_D = 14, 214 214 CODETYPEQZSS_L5_P = 15, 215 215 CODETYPEQZSS_L5_DP = 16, 216 CODETYPEQZSS_L6 E= 17,216 CODETYPEQZSS_L6_E = 17, 217 217 CODETYPEQZSS_L6_DE = 18, 218 218 
trunk/BNC/src/bncconst.cpp
r8407 r8629 41 41 // GLONASS 42 42 case t_frequency::R1: return 1602000000.0 + 562500.0 * slotNum; 43 //case t_frequency::R1a:return 1600995000.0;43 case t_frequency::R4: return 1600995000.0; 44 44 case t_frequency::R2: return 1246000000.0 + 437500.0 * slotNum; 45 //case t_frequency::R2a:return 1248060000.0;45 case t_frequency::R6: return 1248060000.0; 46 46 case t_frequency::R3: return 1202025000.0; 47 47 // Galileo … … 51 51 case t_frequency::E8: return 1191795000.0; 52 52 case t_frequency::E6: return 1278750000.0; 53 // SBAS 54 case t_frequency::S1: return 1575420000.0; 55 case t_frequency::S5: return 1176450000.0; 53 56 // QZSS 54 57 case t_frequency::J1: return 1575420000.0; … … 59 62 case t_frequency::C2: return 1561098000.0; 60 63 case t_frequency::C1: return 1575420000.0; 64 case t_frequency::C5: return 1176450000.0; 61 65 case t_frequency::C7: return 1207140000.0; 66 case t_frequency::C8: return 1191795000.0; 62 67 case t_frequency::C6: return 1268520000.0; 63 // irnss68 // IRNSS 64 69 case t_frequency::I5: return 1176450000.0; 65 70 case t_frequency::I9: return 2492028000.0; 66 // SBAS 67 case t_frequency::S1: return 1575420000.0; 68 case t_frequency::S5: return 1176450000.0; 71 // 69 72 case t_frequency::dummy: 70 73 case t_frequency::max: return 0.0; 
trunk/BNC/src/bncconst.h
r8407 r8629 34 34 enum type {dummy = 0, 35 35 // GPS 36 G1, 37 G2, 38 G5, 36 G1, // L1 / 1575.42 37 G2, // L2 / 1227.60 38 G5, // L5 / 1176.45 39 39 // GLONASS 40 R1, // G1 41 // R1a,// G1a / 1600.99542 R2, // G2 43 // R2a,// G1b / 1248.0640 R1, // G1 / 1602 + k * 9/16 (k = 7 .. +12) 41 R4, // G1a / 1600.995 42 R2, // G2 / 1246 + k * 7/16 (k = 7 .. +12) 43 R6, // G1b / 1248.06 44 44 R3, // G3 / 1202.025 45 45 // Galileo … … 50 50 E6, // E6 / 1278.75 51 51 // QZSS 52 J1, // 1575.4253 J2, // 1227.6054 J5, // 1176.4555 J6, // 1278.7552 J1, // L1 / 1575.42 53 J2, // L2 / 1227.60 54 J5, // L5 / 1176.45 55 J6, // L6 / 1278.75 56 56 // BDS 57 C2, // 1561.098 58 C1, // 1575.42 59 C5, // 1176.45 60 C7, // 1207.14 61 C6, // 1268.52 57 C2, // B12 / 1561.098 58 C1, // B1 / 1575.42 (BDS3 signals) 59 C5, // B2a / 1176.45 (BDS3 signals) 60 C7, // B2b / 1207.14 (BDS2 signals) 61 C8, // B2 (B2a + B2b) / 1191.795 (BDS3 signals) 62 C6, // B3 / 1268.52 62 63 // IRNSS 63 I5, // 1176.4564 I9, // 2492.02864 I5, // L5 / 1176.45 65 I9, // S / 2492.028 65 66 // SBAS 66 S1, // 1575.4267 S5, // 1176.4567 S1, // L1 / 1575.42 68 S5, // L5 / 1176.45 68 69 max}; 69 70 … … 75 76 // GLONASS 76 77 else if (tt == R1) return "R1"; 77 // else if (tt == R1a) return "R5";78 else if (tt == R4) return "R4"; 78 79 else if (tt == R2) return "R2"; 79 // else if (tt == R2a) return "R7";80 else if (tt == R6) return "R6"; 80 81 else if (tt == R3) return "R3"; 81 82 // Galileo … … 95 96 else if (tt == C5) return "C5"; 96 97 else if (tt == C7) return "C7"; 98 else if (tt == C8) return "C8"; 97 99 else if (tt == C6) return "C6"; 98 100 // IRNSS … … 129 131 else if (s == "C5") return C5; 130 132 else if (s == "C7") return C7; 133 else if (s == "C8") return C8; 131 134 else if (s == "C6") return C6; 132 135 // IRNSS 
trunk/BNC/src/rinex/rnxobsfile.cpp
r8407 r8629 334 334 335 335 _obsTypes['J'] << "C1C" << "L1C" << "S1C" 336 << "C1S" << "L1S" << "S1S" 337 << "C1L" << "L1L" << "S1L" 336 << "C1Z" << "L1Z" << "S1Z" 338 337 << "C1X" << "L1X" << "S1X" 339 << "C2S" << "L2S" << "S2S"340 338 << "C2L" << "L2L" << "S2L" 341 339 << "C2X" << "L2X" << "S2X" 342 << "C5X" << "L5X" << "S5X"; 340 << "C5Q" << "L5Q" << "S5Q" 341 << "C5X" << "L5X" << "S5X" 342 << "C6L" << "L6L" << "S6L"; 343 343 344 344 _obsTypes['R'] << "C1C" << "L1C" << "S1C" … … 346 346 << "C2C" << "L2C" << "S2C" 347 347 << "C2P" << "L2P" << "S2P" 348 << "C3I" << "L3I" << "S3I"; 348 << "C3I" << "L3I" << "S3I" 349 << "C4X" << "L4X" << "S4X" 350 << "C6X" << "L6X" << "S5X"; 349 351 350 352 _obsTypes['E'] << "C1X" << "L1X" << "S1X"
Note: See TracChangeset
for help on using the changeset viewer.