Changeset 2690 in ntrip
- Timestamp:
- Nov 14, 2010, 11:07:36 AM (13 years ago)
- Location:
- trunk/BNC
- Files:
-
- 5 edited
-
RTCM/GPSDecoder.h (modified) (2 diffs)
-
RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
-
RTIGS/RTIGSDecoder.cpp (modified) (1 diff)
-
bnccaster.cpp (modified) (1 diff)
-
bncrinex.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/RTCM/GPSDecoder.h
r2689 r2690 58 58 S2 = 0.0; 59 59 S5 = 0.0; 60 SNR1 = 0;61 SNR2 = 0;62 SNR5 = 0;63 60 StatID[0] = '\x0'; 64 61 } … … 81 78 double L2; // L2 carrier phase (cycles) 82 79 double L5; // L5 carrier phase (cycles) 80 double S1; // raw L1 signal strength 81 double S2; // raw L2 signal strength 82 double S5; // raw L5 signal strength 83 83 int slip_cnt_L1; // L1 cumulative loss of continuity indicator (negative value = undefined) 84 84 int slip_cnt_L2; // L2 cumulative loss of continuity indicator (negative value = undefined) 85 85 int slip_cnt_L5; // L5 cumulative loss of continuity indicator (negative value = undefined) 86 double S1; // L1 signal-to noise ratio87 double S2; // L2 signal-to noise ratio88 double S5; // L5 signal-to noise ratio89 int SNR1; // L1 signal-to noise ratio (mapped to integer)90 int SNR2; // L2 signal-to noise ratio (mapped to integer)91 int SNR5; // L5 signal-to noise ratio (mapped to integer)92 86 }; 93 87 -
trunk/BNC/RTCM3/RTCM3Decoder.cpp
r2687 r2690 371 371 iEntry == GNSSENTRY_L1PDATA) { 372 372 obs->_o.L1 = gnssData.measdata[iSat][iEntry]; 373 obs->_o.SNR1 = gnssData.snrL1[iSat];374 373 } 375 374 else if (iEntry == GNSSENTRY_L2CDATA || 376 375 iEntry == GNSSENTRY_L2PDATA) { 377 376 obs->_o.L2 = gnssData.measdata[iSat][iEntry]; 378 obs->_o.SNR2 = gnssData.snrL2[iSat];379 377 } 380 378 else if (iEntry == GNSSENTRY_S1CDATA || -
trunk/BNC/RTIGS/RTIGSDecoder.cpp
r2585 r2690 129 129 obs->_o.S1 = _GPSTrans.DecObs.Obs[ii].l1_sn; 130 130 obs->_o.S2 = _GPSTrans.DecObs.Obs[ii].l2_sn; 131 obs->_o.SNR1 = int(ceil(_GPSTrans.DecObs.Obs[ii].l1_sn / 60.0 * 9.0));132 obs->_o.SNR2 = int(ceil(_GPSTrans.DecObs.Obs[ii].l2_sn / 60.0 * 9.0));133 131 } 134 132 } -
trunk/BNC/bnccaster.cpp
r2647 r2690 368 368 _out->setFieldWidth(1); *_out << " "; 369 369 _out->setFieldWidth(14); _out->setRealNumberPrecision(3); *_out << obs->_o.S2; 370 _out->setFieldWidth(1); 371 *_out << " " << obs->_o.SNR1 << " " << obs->_o.SNR2 << endl; 370 *_out << endl; 372 371 if (!it.hasNext()) { 373 372 _out->setFieldWidth(1); *_out << endEpoch << endl; -
trunk/BNC/bncrinex.cpp
r2689 r2690 413 413 else if (line.indexOf("# / TYPES OF OBSERV") != -1) { 414 414 if (_rinexVers == 3) { 415 _out << "G 10 C1C C1P L1C S1C C2W C2P L2W S2W L2P S2PSYS / # / OBS TYPES" << endl;416 _out << "R 10 C1C C1P L1C S1C C2C C2P L2C S2C L2P S2PSYS / # / OBS TYPES" << endl;415 _out << "G 8 C1C C1P L1C S1C C2W C2P L2W S2W SYS / # / OBS TYPES" << endl; 416 _out << "R 8 C1C C1P L1C S1C C2C C2P L2C S2C SYS / # / OBS TYPES" << endl; 417 417 _out << "E 6 C1X L1X S1X C5X L5X S5X SYS / # / OBS TYPES" << endl; 418 418 _out << "S 3 C1C L1C S1C SYS / # / OBS TYPES" << endl; 419 419 } 420 420 else { 421 _out << " 8 C1 C2 P1 P2 L1 L2 S1S2"421 _out << " 8 C1 P1 L1 S1 C2 P2 L2 S2" 422 422 " # / TYPES OF OBSERV" << endl; 423 423 } … … 485 485 << " " << "ANTENNA: DELTA H/E/N" << endl; 486 486 if (_rinexVers == 3) { 487 _out << "G 10 C1C C1P L1C S1C C2W C2P L2W S2W L2P S2PSYS / # / OBS TYPES" << endl;488 _out << "R 10 C1C C1P L1C S1C C2C C2P L2C S2C L2P S2PSYS / # / OBS TYPES" << endl;487 _out << "G 8 C1C C1P L1C S1C C2W C2P L2W S2W SYS / # / OBS TYPES" << endl; 488 _out << "R 8 C1C C1P L1C S1C C2C C2P L2C S2C SYS / # / OBS TYPES" << endl; 489 489 _out << "E 6 C1X L1X S1X C5X L5X S5X SYS / # / OBS TYPES" << endl; 490 490 _out << "S 3 C1C L1C S1C SYS / # / OBS TYPES" << endl; … … 492 492 else { 493 493 _out << " 1 1 WAVELENGTH FACT L1/2" << endl; 494 _out << " 8 C1 C2 P1 P2 L1 L2 S1S2 # / TYPES OF OBSERV" << endl;494 _out << " 8 C1 P1 L1 S1 C2 P2 L2 S2 # / TYPES OF OBSERV" << endl; 495 495 } 496 496 _out << datTim.toString(" yyyy MM dd" … … 633 633 _out << obs->_o.satSys 634 634 << setw(2) << setfill('0') << obs->_o.satNum << setfill(' ') 635 << setw(14) << setprecision(3) << obs->_o.C1 << " " 636 << setw(14) << setprecision(3) << obs->_o.P1 << " " 637 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 638 << setw(1) << obs->_o.SNR1 639 << setw(14) << setprecision(3) << obs->_o.S1 << " " 640 << setw(14) << setprecision(3) << obs->_o.C2 << " " 641 << setw(14) << setprecision(3) << obs->_o.P2 << " " ; 642 if ((obs->_o.C2 != 0.0) && (obs->_o.P2 == 0.0)) { 643 _out << setw(14) << setprecision(3) << obs->_o.L2 << lli2 644 << setw(1) << obs->_o.SNR2 645 << setw(14) << setprecision(3) << obs->_o.S2 << " " 646 << " 0.000 0.000 "; 647 } 648 else { 649 _out << " 0.000 0.000 " 650 << setw(14) << setprecision(3) << obs->_o.L2 << " " 651 << setw(1) << obs->_o.SNR2 652 << setw(14) << setprecision(3) << obs->_o.S2; 653 } 654 _out << endl; 635 << setw(14) << setprecision(3) << obs->_o.C1 << ' ' << ' ' 636 << setw(14) << setprecision(3) << obs->_o.P1 << ' ' << ' ' 637 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 << ' ' 638 << setw(14) << setprecision(3) << obs->_o.S1 << ' ' << ' ' 639 << setw(14) << setprecision(3) << obs->_o.C2 << ' ' << ' ' 640 << setw(14) << setprecision(3) << obs->_o.P2 << ' ' << ' ' 641 << setw(14) << setprecision(3) << obs->_o.L2 << lli2 << ' ' 642 << setw(14) << setprecision(3) << obs->_o.S2 << endl; 655 643 } 656 644 else if (obs->_o.satSys == 'S') { // SBAS 657 645 _out << obs->_o.satSys 658 646 << setw(2) << setfill('0') << obs->_o.satNum << setfill(' ') 659 << setw(14) << setprecision(3) << obs->_o.C1 << " " 660 << setw(14) << setprecision(3) << obs->_o.P1 << " " 661 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 662 << setw(1) << obs->_o.SNR1 647 << setw(14) << setprecision(3) << obs->_o.C1 << ' ' << ' ' 648 << setw(14) << setprecision(3) << obs->_o.P1 << ' ' << ' ' 649 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 << ' ' 663 650 << setw(14) << setprecision(3) << obs->_o.S1 << endl; 664 651 } … … 666 653 _out << obs->_o.satSys 667 654 << setw(2) << setfill('0') << obs->_o.satNum << setfill(' ') 668 << setw(14) << setprecision(3) << obs->_o.C1 << " "669 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 << " "670 << setw(14) << setprecision(3) << obs->_o.S1 << " "671 << setw(14) << setprecision(3) << obs->_o.C5 << " "672 << setw(14) << setprecision(3) << obs->_o.L5 << lli5 << " "655 << setw(14) << setprecision(3) << obs->_o.C1 << ' ' << ' ' 656 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 << ' ' 657 << setw(14) << setprecision(3) << obs->_o.S1 << ' ' << ' ' 658 << setw(14) << setprecision(3) << obs->_o.C5 << ' ' << ' ' 659 << setw(14) << setprecision(3) << obs->_o.L5 << lli5 << ' ' 673 660 << setw(14) << setprecision(3) << obs->_o.S5 << endl; 674 661 } … … 678 665 // --------------- 679 666 else { 680 char lli = ' '; 681 char snr = ' '; 682 _out << setw(14) << setprecision(3) << obs->_o.C1 << lli << snr; 683 _out << setw(14) << setprecision(3) << obs->_o.C2 << lli << snr; 684 _out << setw(14) << setprecision(3) << obs->_o.P1 << lli << snr; 685 _out << setw(14) << setprecision(3) << obs->_o.P2 << lli << snr; 686 _out << setw(14) << setprecision(3) << obs->_o.L1 << lli1 687 << setw(1) << obs->_o.SNR1 << endl; 688 _out << setw(14) << setprecision(3) << obs->_o.L2 << lli2 689 << setw(1) << obs->_o.SNR2; 690 _out << setw(14) << setprecision(3) << obs->_o.S1 ; 691 _out << setw(16) << setprecision(3) << obs->_o.S2 ; 692 _out << endl; 667 _out << setw(14) << setprecision(3) << obs->_o.C1 << ' ' << ' ' 668 << setw(14) << setprecision(3) << obs->_o.P1 << ' ' << ' ' 669 << setw(14) << setprecision(3) << obs->_o.L1 << lli1 << ' ' 670 << setw(14) << setprecision(3) << obs->_o.S1 << ' ' << ' ' 671 << setw(14) << setprecision(3) << obs->_o.C2 << ' ' << ' ' << endl 672 << setw(14) << setprecision(3) << obs->_o.P2 << ' ' << ' ' 673 << setw(14) << setprecision(3) << obs->_o.L2 << lli2 << ' ' 674 << setw(16) << setprecision(3) << obs->_o.S2 << endl; 693 675 } 694 676
Note:
See TracChangeset
for help on using the changeset viewer.
