- Timestamp:
- Aug 24, 2026, 10:34:41 PM (5 days ago)
- Location:
- trunk/BNC/src
- Files:
-
- 8 edited
-
RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
-
RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
-
RTCM3/clock_and_orbit/clock_orbit.h (modified) (7 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_igs.cpp (modified) (2 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (modified) (2 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (modified) (18 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h (modified) (1 diff)
-
upload/bncrtnetuploadcaster.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/RTCM3/RTCM3Decoder.cpp
r10932 r10994 2270 2270 } 2271 2271 else { 2272 _coDecoders[_staID.toLatin1()]->initSsrFormatType(RTCM3coDecoder::RTCMssr); 2272 _coDecoders[_staID.toLatin1()]->initSsrFormatType(RTCM3coDecoder::RTCMnewssr); 2273 2273 } 2274 2274 } -
trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp
r10993 r10994 511 511 frqPhaseBias._rnxType2ch.assign(_ssrCorr->codeTypeToRnxType(sys, biasEntry.Type)); 512 512 frqPhaseBias._value = biasEntry.Bias; 513 frqPhaseBias._fixIndicator = biasEntry. SignalIntegerIndicator;514 frqPhaseBias._fixWideLaneIndicator = biasEntry. SignalsWideLaneIntegerIndicator;515 frqPhaseBias._jumpCounter = biasEntry. SignalDiscontinuityCounter;513 frqPhaseBias._fixIndicator = biasEntry.IntegerIndicator; 514 frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator; 515 frqPhaseBias._jumpCounter = biasEntry.DiscontinuityCounter; 516 516 if (!frqPhaseBias._rnxType2ch.empty()) { 517 517 satPhaseBias._bias.push_back(frqPhaseBias); -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
r10990 r10994 315 315 CodeType CODETYPE_BDS_B2_Q; 316 316 CodeType CODETYPE_BDS_B2_IQ; 317 CodeType CODETYPE_BDS_B1a_D; // B1a should be B1C317 CodeType CODETYPE_BDS_B1a_D; 318 318 CodeType CODETYPE_BDS_B1a_P; 319 319 CodeType CODETYPE_BDS_B1a_DP; … … 398 398 unsigned int SSRProviderID; 399 399 unsigned int SSRSolutionID; 400 unsigned int DispersiveBiasConsistencyIndicator; 400 /* IGS-SSR and old RTCM-SSR only*/ 401 unsigned int DispersiveBiasConsistencyIndicator; 401 402 unsigned int MWConsistencyIndicator; 403 /* new RTCM-SSR only*/ 404 unsigned int SatelliteYawInformationIndicator; 405 unsigned int ExtendedPhaseBiasPropertyID; 402 406 struct PhaseBiasSat { 403 407 unsigned int ID; /* all */ … … 407 411 struct PhaseBiasEntry { 408 412 CodeType Type; 409 unsigned int SignalIntegerIndicator;410 unsigned int SignalsWideLaneIntegerIndicator;411 unsigned int SignalDiscontinuityCounter;413 unsigned int IntegerIndicator; 414 unsigned int DiscontinuityCounter; 415 unsigned int WidelaneGroupIndicator; 412 416 float Bias; /* m */ 413 417 } Biases[CLOCKORBIT_NUMBIAS]; … … 466 470 #define E_GLONASS_SATELLITE_ID_OLD(a) ADDBITS( 5, a) /* DF384 (old RTCM) */ 467 471 #define E_GPS_IODE(a) ADDBITS( 8, a) /* IDF012 DF071 */ 468 #define E_GLONASS_IOD(a) ADDBITS( 8, a) /* DF 239*/472 #define E_GLONASS_IOD(a) ADDBITS( 8, a) /* DF392 */ 469 473 #define E_GALILEO_IOD(a) ADDBITS(10, a) /* DF459 */ 470 #define E_SBAS_T0MOD(a) ADDBITS( 9, (a/16)) 474 #define E_SBAS_T0MOD(a) ADDBITS( 9, (a/16)) /* DF468 */ 471 475 #define E_SBAS_IODCRC(a) ADDBITS(24, a) /* DF469 */ 472 476 #define E_BDS_TOEMOD(a) ADDBITS(10, (a/8)) /* DF470 */ … … 502 506 #define E_YAW_INFO_INDICATOR(a) ADDBITS(1, a) /* DF486 (new RTCM) */ 503 507 #define E_MW_CONSISTENCY_INDICATOR(a) ADDBITS(1, a) /* DF487 (old RTCM), IDF033 */ 504 505 508 #define E_EXTENDED_PHASE_BIAS_ID(a) ADDBITS(4, a) /* DF+002 (new RTCM) */ 506 509 507 #define E_GLONASS_SATELLITE_ID(a) ADDBITS(6, a) /* DF+003 (new RTCM) */ 510 #define E_GLONASS_SATELLITE_ID(a) ADDBITS(6, a) /* DF+003 (new RTCM) */ 508 511 509 512 /* URA */ 510 #define E_SSR_URA(a) ADDBITS(6, a) /* DF389, IDF034 */ 513 #define E_SSR_URA(a) ADDBITS(6, a) /* DF389, IDF034 */ 511 514 512 515 /* Ionosphere */ … … 717 720 718 721 #define D_GPS_IODE(a) GETSSRBITS(a, 8) /* DF071, DF467, IDF012 */ 722 #define D_GLONASS_IOD(a) GETSSRBITS(a, 8) /* DF392 */ 719 723 #define D_GALILEO_IOD(a) GETSSRBITS(a, 10) /* DF459 */ 720 724 … … 753 757 #define D_MW_CONSISTENCY_INDICATOR(a) GETSSRBITS(a, 1) /* DF487, IDF033 */ 754 758 755 #define D_EXTENDED_PHASE_BIAS_ID(a) GETSSRBITS( 4, a) /* DF+002 (new RTCM)*/759 #define D_EXTENDED_PHASE_BIAS_ID(a) GETSSRBITS(a, 4) /* DF+002 (new RTCM)*/ 756 760 757 761 #define D_GLONASS_SATELLITE_ID(a) GETSSRBITS(a, 6) /* DF+003 (new RTCM)*/ -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp
r10990 r10994 266 266 for (j = 0; j < b->Sat[i].NumberOfPhaseBiases; ++j) { 267 267 E_GNSS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type) 268 E_INTEGER_INDICATOR(b->Sat[i].Biases[j]. SignalIntegerIndicator ? 1 : 0)269 E_WIDE_LANE_INDICATOR(b->Sat[i].Biases[j]. SignalsWideLaneIntegerIndicator)270 E_DISCONTINUITY_COUNTER(b->Sat[i].Biases[j]. SignalDiscontinuityCounter)268 E_INTEGER_INDICATOR(b->Sat[i].Biases[j].IntegerIndicator ? 1 : 0) 269 E_WIDE_LANE_INDICATOR(b->Sat[i].Biases[j].WidelaneGroupIndicator) 270 E_DISCONTINUITY_COUNTER(b->Sat[i].Biases[j].DiscontinuityCounter) 271 271 E_PHASE_BIAS_CORRECTION(b->Sat[i].Biases[j].Bias) 272 272 } … … 701 701 for (j = 0; j < pb->Sat[pos].NumberOfPhaseBiases; ++j) { 702 702 D_GNSS_SIGNAL_IDENTIFIER(pb->Sat[pos].Biases[j].Type) 703 D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j]. SignalIntegerIndicator)704 D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j]. SignalsWideLaneIntegerIndicator)705 D_DISCONTINUITY_COUNTER(pb->Sat[pos].Biases[j]. SignalDiscontinuityCounter)703 D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j].IntegerIndicator) 704 D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j].WidelaneGroupIndicator) 705 D_DISCONTINUITY_COUNTER(pb->Sat[pos].Biases[j].DiscontinuityCounter) 706 706 D_PHASE_BIAS_CORRECTION(pb->Sat[pos].Biases[j].Bias) 707 707 #ifdef BNC_DEBUG_SSR 708 708 fprintf(stderr, "t%02d int %d wl %d disc %02d b %8.4f ", 709 709 pb->Sat[pos].Biases[j].Type, 710 pb->Sat[pos].Biases[j]. SignalIntegerIndicator,711 pb->Sat[pos].Biases[j]. SignalsWideLaneIntegerIndicator,712 pb->Sat[pos].Biases[j]. SignalDiscontinuityCounter,710 pb->Sat[pos].Biases[j].IntegerIndicator, 711 pb->Sat[pos].Biases[j].WidelaneGroupIndicator, 712 pb->Sat[pos].Biases[j].DiscontinuityCounter, 713 713 pb->Sat[pos].Biases[j].Bias); 714 714 #endif -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp
r10990 r10994 449 449 for (j = 0; j < b->Sat[i].NumberOfPhaseBiases; ++j) { 450 450 E_GNSS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type) 451 E_INTEGER_INDICATOR( 452 b->Sat[i].Biases[j].SignalIntegerIndicator ? 1 : 0) 453 E_WIDE_LANE_INDICATOR( 454 b->Sat[i].Biases[j].SignalsWideLaneIntegerIndicator) 455 E_DISCONTINUITY_COUNTER( 456 b->Sat[i].Biases[j].SignalDiscontinuityCounter) 451 E_INTEGER_INDICATOR(b->Sat[i].Biases[j].IntegerIndicator ? 1 : 0) 452 E_WIDE_LANE_INDICATOR(b->Sat[i].Biases[j].WidelaneGroupIndicator) 453 E_DISCONTINUITY_COUNTER(b->Sat[i].Biases[j].DiscontinuityCounter) 457 454 E_PHASE_BIAS_CORRECTION(b->Sat[i].Biases[j].Bias) 458 455 } … … 650 647 for (j = 0; j < pb->Sat[pos].NumberOfPhaseBiases; ++j) { 651 648 D_GNSS_SIGNAL_IDENTIFIER(pb->Sat[pos].Biases[j].Type) 652 D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j]. SignalIntegerIndicator)649 D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j].IntegerIndicator) 653 650 D_WIDE_LANE_INDICATOR( 654 pb->Sat[pos].Biases[j]. SignalsWideLaneIntegerIndicator)651 pb->Sat[pos].Biases[j].WidelaneGroupIndicator) 655 652 D_DISCONTINUITY_COUNTER( 656 pb->Sat[pos].Biases[j]. SignalDiscontinuityCounter)653 pb->Sat[pos].Biases[j].DiscontinuityCounter) 657 654 D_PHASE_BIAS_CORRECTION(pb->Sat[pos].Biases[j].Bias) 658 655 #ifdef BNC_DEBUG_SSR 659 656 fprintf(stderr, "t%02d int %d wl %d disc %d b %8.4f ", 660 657 pb->Sat[pos].Biases[j].Type, 661 pb->Sat[pos].Biases[j]. SignalIntegerIndicator,662 pb->Sat[pos].Biases[j]. SignalsWideLaneIntegerIndicator,663 pb->Sat[pos].Biases[j]. SignalDiscontinuityCounter,658 pb->Sat[pos].Biases[j].IntegerIndicator, 659 pb->Sat[pos].Biases[j].WidelaneGroupIndicator, 660 pb->Sat[pos].Biases[j].DiscontinuityCounter, 664 661 pb->Sat[pos].Biases[j].Bias); 665 662 #endif -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp
r10990 r10994 148 148 E_NO_OF_SATELLITES(co->NumberOfSat[s]) 149 149 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 150 switch (s) { 151 case CLOCKORBIT_SATGPS: 152 case CLOCKORBIT_SATGALILEO: 153 case CLOCKORBIT_SATSBAS: 154 case CLOCKORBIT_SATBDS: 155 E_GPS_SATELLITE_ID(co->Sat[i].ID) 156 break; 157 case CLOCKORBIT_SATQZSS: 158 E_QZSS_SATELLITE_ID(co->Sat[i].ID) 159 break; 160 case CLOCKORBIT_SATGLONASS: 161 E_GLONASS_SATELLITE_ID(co->Sat[i].ID) 162 break; 163 } 150 E_GPS_SATELLITE_ID(co->Sat[i].ID) 164 151 E_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0) 165 152 E_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1) … … 281 268 E_NO_OF_SATELLITES(co->NumberOfSat[s]) 282 269 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 283 switch (s) { 284 case CLOCKORBIT_SATGPS: 285 case CLOCKORBIT_SATGALILEO: 286 case CLOCKORBIT_SATSBAS: 287 case CLOCKORBIT_SATBDS: 288 E_GPS_SATELLITE_ID(co->Sat[i].ID) 289 break; 290 case CLOCKORBIT_SATQZSS: 291 E_QZSS_SATELLITE_ID(co->Sat[i].ID) 292 break; 293 case CLOCKORBIT_SATGLONASS: 294 E_GLONASS_SATELLITE_ID(co->Sat[i].ID) 295 break; 296 } 270 E_GPS_SATELLITE_ID(co->Sat[i].ID) 297 271 E_HR_CLOCK_CORRECTION(co->Sat[i].hrclock) 298 272 } … … 321 295 E_NO_OF_SATELLITES(co->NumberOfSat[s]) 322 296 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 323 switch (s) { 324 case CLOCKORBIT_SATGPS: 325 case CLOCKORBIT_SATGALILEO: 326 case CLOCKORBIT_SATSBAS: 327 case CLOCKORBIT_SATBDS: 328 E_GPS_SATELLITE_ID(co->Sat[i].ID) 329 break; 330 case CLOCKORBIT_SATQZSS: 331 E_QZSS_SATELLITE_ID(co->Sat[i].ID) 332 break; 333 case CLOCKORBIT_SATGLONASS: 334 E_GLONASS_SATELLITE_ID(co->Sat[i].ID) 335 break; 336 } 297 E_GPS_SATELLITE_ID(co->Sat[i].ID) 337 298 E_SSR_URA(ValueToURA(co->Sat[i].UserRangeAccuracy)) 338 299 } … … 372 333 E_NO_OF_SATELLITES(b->NumberOfSat[s]) 373 334 for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { 374 switch (s) { 375 case CLOCKORBIT_SATGPS: 376 case CLOCKORBIT_SATGALILEO: 377 case CLOCKORBIT_SATSBAS: 378 case CLOCKORBIT_SATBDS: 379 E_GPS_SATELLITE_ID(b->Sat[i].ID) 380 break; 381 case CLOCKORBIT_SATQZSS: 382 E_QZSS_SATELLITE_ID(b->Sat[i].ID) 383 break; 384 case CLOCKORBIT_SATGLONASS: 385 E_GLONASS_SATELLITE_ID(b->Sat[i].ID) 386 break; 387 } 335 E_GPS_SATELLITE_ID(b->Sat[i].ID) 388 336 E_NO_OF_BIASES(b->Sat[i].NumberOfCodeBiases) 389 337 for (j = 0; j < b->Sat[i].NumberOfCodeBiases; ++j) { … … 404 352 STARTDATA 405 353 406 for (s = 0; s < CLOCKORBIT_SATNUM; ++s) { 354 for (s = 0; s < CLOCKORBIT_SATNUM; ++s) { 355 /* The Widelane Signal Group Indicator shall be releated for every satellite and signal 356 included in the corresponding Satellite Phase Bias Message in the same order. The 357 Extended Satellite Phase Bias Message shall be sent before the corresponding 358 Satellite Phase Bias Message */ 359 if (b->NumberOfSat[s] && (type == PBEXTTYPE_AUTO || type == s + PBEXTTYPE_AUTO)) { 360 INITBLOCK 361 E_RTCM_MESSAGE_NUMBER(s + PBEXTTYPE_AUTO) 362 switch (s) { 363 case CLOCKORBIT_SATGPS: 364 case CLOCKORBIT_SATGALILEO: 365 case CLOCKORBIT_SATQZSS: 366 case CLOCKORBIT_SATSBAS: 367 case CLOCKORBIT_SATBDS: 368 E_GPS_EPOCH_TIME(b->EpochTime[s]) 369 break; 370 case CLOCKORBIT_SATGLONASS: 371 E_GLONASS_EPOCH_TIME(b->EpochTime[s]) 372 break; 373 } 374 E_SSR_UPDATE_INTERVAL(b->UpdateInterval) 375 E_SSR_IOD(b->SSRIOD) 376 E_SSR_PROVIDER_ID(b->SSRProviderID) 377 E_SSR_SOLUTION_ID(b->SSRSolutionID) 378 E_EXTENDED_PHASE_BIAS_ID(b->ExtendedPhaseBiasPropertyID) 379 for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { 380 for (j = 0; j < b->Sat[i].NumberOfPhaseBiases; ++j) { 381 E_WIDE_LANE_INDICATOR(b->Sat[i].Biases[j].WidelaneGroupIndicator) 382 } 383 } 384 ENDBLOCK 385 } 407 386 if (b->NumberOfSat[s] && (type == PBTYPE_AUTO || type == s + PBTYPE_BASE)) { 408 387 INITBLOCK … … 425 404 E_SSR_PROVIDER_ID(b->SSRProviderID) 426 405 E_SSR_SOLUTION_ID(b->SSRSolutionID) 427 E_ DISPERSIVE_BIAS_INDICATOR(b->DispersiveBiasConsistencyIndicator? 1 : 0)428 E_ MW_CONSISTENCY_INDICATOR(b->MWConsistencyIndicator ? 1 : 0)406 E_YAW_INFO_INDICATOR(b->SatelliteYawInformationIndicator) 407 E_EXTENDED_PHASE_BIAS_ID(b->ExtendedPhaseBiasPropertyID) 429 408 E_NO_OF_SATELLITES(b->NumberOfSat[s]) 430 409 for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { 431 switch (s) { 432 case CLOCKORBIT_SATGPS: 433 case CLOCKORBIT_SATGALILEO: 434 case CLOCKORBIT_SATSBAS: 435 case CLOCKORBIT_SATBDS: 436 E_GPS_SATELLITE_ID(b->Sat[i].ID) 437 break; 438 case CLOCKORBIT_SATQZSS: 439 E_QZSS_SATELLITE_ID(b->Sat[i].ID) 440 break; 441 case CLOCKORBIT_SATGLONASS: 442 E_GLONASS_SATELLITE_ID(b->Sat[i].ID) 443 break; 444 } 410 E_GPS_SATELLITE_ID(b->Sat[i].ID) 445 411 E_NO_OF_BIASES(b->Sat[i].NumberOfPhaseBiases) 446 412 E_YAW_ANGLE(b->Sat[i].YawAngle) … … 448 414 for (j = 0; j < b->Sat[i].NumberOfPhaseBiases; ++j) { 449 415 E_GNSS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type) 450 E_INTEGER_INDICATOR( 451 b->Sat[i].Biases[j].SignalIntegerIndicator ? 1 : 0) 452 E_WIDE_LANE_INDICATOR( 453 b->Sat[i].Biases[j].SignalsWideLaneIntegerIndicator) 454 E_DISCONTINUITY_COUNTER( 455 b->Sat[i].Biases[j].SignalDiscontinuityCounter) 416 E_INTEGER_INDICATOR(b->Sat[i].Biases[j].IntegerIndicator ? 1 : 0) 417 E_DISCONTINUITY_COUNTER(b->Sat[i].Biases[j].DiscontinuityCounter) 456 418 E_PHASE_BIAS_CORRECTION(b->Sat[i].Biases[j].Bias) 457 419 } … … 606 568 D_SSR_PROVIDER_ID(pb->SSRProviderID) 607 569 D_SSR_SOLUTION_ID(pb->SSRSolutionID) 608 D_ DISPERSIVE_BIAS_INDICATOR(pb->DispersiveBiasConsistencyIndicator)609 D_ MW_CONSISTENCY_INDICATOR(pb->MWConsistencyIndicator)570 D_YAW_INFO_INDICATOR(pb->SatelliteYawInformationIndicator) 571 D_EXTENDED_PHASE_BIAS_ID(pb->ExtendedPhaseBiasPropertyID) 610 572 D_NO_OF_SATELLITES(nums) 611 573 #ifdef BNC_DEBUG_SSR … … 616 578 #endif 617 579 for (i = 0; i < nums; ++i) { 618 switch (s) { 619 case CLOCKORBIT_SATGPS: 620 case CLOCKORBIT_SATGALILEO: 621 case CLOCKORBIT_SATSBAS: 622 case CLOCKORBIT_SATBDS: 623 D_GPS_SATELLITE_ID(id) 624 break; 625 case CLOCKORBIT_SATQZSS: 626 D_QZSS_SATELLITE_ID(id) 627 break; 628 case CLOCKORBIT_SATGLONASS: 629 D_GLONASS_SATELLITE_ID(id) 630 break; 631 } 580 D_GPS_SATELLITE_ID(id) 632 581 for (pos = satoffset[s]; 633 582 pos < satoffset[s] + pb->NumberOfSat[s] && pb->Sat[pos].ID != id; … … 649 598 for (j = 0; j < pb->Sat[pos].NumberOfPhaseBiases; ++j) { 650 599 D_GNSS_SIGNAL_IDENTIFIER(pb->Sat[pos].Biases[j].Type) 651 D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j].SignalIntegerIndicator) 652 D_WIDE_LANE_INDICATOR( 653 pb->Sat[pos].Biases[j].SignalsWideLaneIntegerIndicator) 654 D_DISCONTINUITY_COUNTER( 655 pb->Sat[pos].Biases[j].SignalDiscontinuityCounter) 600 D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j].IntegerIndicator) 601 D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j].WidelaneGroupIndicator) 602 D_DISCONTINUITY_COUNTER(pb->Sat[pos].Biases[j].DiscontinuityCounter) 656 603 D_PHASE_BIAS_CORRECTION(pb->Sat[pos].Biases[j].Bias) 657 604 #ifdef BNC_DEBUG_SSR 658 605 fprintf(stderr, "t%02d int %d wl %d disc %d b %8.4f ", 659 606 pb->Sat[pos].Biases[j].Type, 660 pb->Sat[pos].Biases[j]. SignalIntegerIndicator,661 pb->Sat[pos].Biases[j]. SignalsWideLaneIntegerIndicator,662 pb->Sat[pos].Biases[j]. SignalDiscontinuityCounter,607 pb->Sat[pos].Biases[j].IntegerIndicator, 608 pb->Sat[pos].Biases[j].WidelaneGroupIndicator, 609 pb->Sat[pos].Biases[j].DiscontinuityCounter, 663 610 pb->Sat[pos].Biases[j].Bias); 664 611 #endif … … 707 654 #endif 708 655 for (i = 0; i < nums; ++i) { 709 switch (s) { 710 case CLOCKORBIT_SATGPS: 711 case CLOCKORBIT_SATGALILEO: 712 case CLOCKORBIT_SATSBAS: 713 case CLOCKORBIT_SATBDS: 714 D_GPS_SATELLITE_ID(id) 715 break; 716 case CLOCKORBIT_SATQZSS: 717 D_QZSS_SATELLITE_ID(id) 718 break; 719 case CLOCKORBIT_SATGLONASS: 720 D_GLONASS_SATELLITE_ID(id) 721 break; 722 } 656 D_GPS_SATELLITE_ID(id) 723 657 for (pos = satoffset[s]; 724 658 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 733 667 switch (s) { 734 668 case CLOCKORBIT_SATGPS: 735 736 669 case CLOCKORBIT_SATQZSS: 670 D_GPS_IODE(co->Sat[pos].IOD) 737 671 break; 738 672 case CLOCKORBIT_SATGLONASS: 739 D_G PS_IODE(co->Sat[pos].IOD)673 D_GLONASS_IOD(co->Sat[pos].IOD) 740 674 break; 741 675 case CLOCKORBIT_SATGALILEO: … … 796 730 #endif 797 731 for (i = 0; i < nums; ++i) { 798 switch (s) { 799 case CLOCKORBIT_SATGPS: 800 case CLOCKORBIT_SATGALILEO: 801 case CLOCKORBIT_SATSBAS: 802 case CLOCKORBIT_SATBDS: 803 D_GPS_SATELLITE_ID(id) 804 break; 805 case CLOCKORBIT_SATQZSS: 806 D_QZSS_SATELLITE_ID(id) 807 break; 808 case CLOCKORBIT_SATGLONASS: 809 D_GLONASS_SATELLITE_ID(id) 810 break; 811 } 732 D_GPS_SATELLITE_ID(id) 812 733 for (pos = satoffset[s]; 813 734 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 861 782 #endif 862 783 for (i = 0; i < nums; ++i) { 863 switch (s) { 864 case CLOCKORBIT_SATGPS: 865 case CLOCKORBIT_SATGALILEO: 866 case CLOCKORBIT_SATSBAS: 867 case CLOCKORBIT_SATBDS: 868 D_GPS_SATELLITE_ID(id) 869 break; 870 case CLOCKORBIT_SATQZSS: 871 D_QZSS_SATELLITE_ID(id) 872 break; 873 case CLOCKORBIT_SATGLONASS: 874 D_GLONASS_SATELLITE_ID(id) 875 break; 876 } 784 D_GPS_SATELLITE_ID(id) 877 785 for (pos = satoffset[s]; 878 786 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 887 795 switch (s) { 888 796 case CLOCKORBIT_SATGPS: 889 890 797 case CLOCKORBIT_SATQZSS: 798 D_GPS_IODE(co->Sat[pos].IOD) 891 799 break; 892 800 case CLOCKORBIT_SATGLONASS: 893 D_G PS_IODE(co->Sat[pos].IOD)801 D_GLONASS_IOD(co->Sat[pos].IOD) 894 802 break; 895 803 case CLOCKORBIT_SATGALILEO: … … 953 861 #endif 954 862 for (i = 0; i < nums; ++i) { 955 switch (s) { 956 case CLOCKORBIT_SATGPS: 957 case CLOCKORBIT_SATGALILEO: 958 case CLOCKORBIT_SATSBAS: 959 case CLOCKORBIT_SATBDS: 960 D_GPS_SATELLITE_ID(id) 961 break; 962 case CLOCKORBIT_SATQZSS: 963 D_QZSS_SATELLITE_ID(id) 964 break; 965 case CLOCKORBIT_SATGLONASS: 966 D_GLONASS_SATELLITE_ID(id) 967 break; 968 } 863 D_GPS_SATELLITE_ID(id) 969 864 for (pos = satoffset[s]; 970 865 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 1012 907 #endif 1013 908 for (i = 0; i < nums; ++i) { 1014 switch (s) { 1015 case CLOCKORBIT_SATGPS: 1016 case CLOCKORBIT_SATGALILEO: 1017 case CLOCKORBIT_SATSBAS: 1018 case CLOCKORBIT_SATBDS: 1019 D_GPS_SATELLITE_ID(id) 1020 break; 1021 case CLOCKORBIT_SATQZSS: 1022 D_QZSS_SATELLITE_ID(id) 1023 break; 1024 case CLOCKORBIT_SATGLONASS: 1025 D_GLONASS_SATELLITE_ID(id) 1026 break; 1027 } 909 D_GPS_SATELLITE_ID(id) 1028 910 for (pos = satoffset[s]; 1029 911 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 1070 952 #endif 1071 953 for (i = 0; i < nums; ++i) { 1072 switch (s) { 1073 case CLOCKORBIT_SATGPS: 1074 case CLOCKORBIT_SATGALILEO: 1075 case CLOCKORBIT_SATSBAS: 1076 case CLOCKORBIT_SATBDS: 1077 D_GPS_SATELLITE_ID(id) 1078 break; 1079 case CLOCKORBIT_SATQZSS: 1080 D_QZSS_SATELLITE_ID(id) 1081 break; 1082 case CLOCKORBIT_SATGLONASS: 1083 D_GLONASS_SATELLITE_ID(id) 1084 break; 1085 } 954 D_GPS_SATELLITE_ID(id) 1086 955 for (pos = satoffset[s]; 1087 956 pos < satoffset[s] + b->NumberOfSat[s] && b->Sat[pos].ID != id; -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h
r10829 r10994 224 224 SsrCorr::CodeType rnxTypeToCodeType(char system, std::string type); 225 225 226 size_t MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type, 227 int moremessagesfollow, char *buffer, size_t size); 228 size_t MakeCodeBias(const struct CodeBias *b, CodeBiasType type, 229 int moremessagesfollow, char *buffer, size_t size); 230 size_t MakePhaseBias(const struct PhaseBias *b, PhaseBiasType type, 231 int moremessagesfollow, char *buffer, size_t size); 232 size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, 233 size_t size); 234 enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *b, 235 struct VTEC *v, struct PhaseBias *pb, const char *buffer, size_t size, 236 int *bytesused); 226 size_t MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type, int moremessagesfollow, char *buffer, size_t size); 227 size_t MakeCodeBias(const struct CodeBias *b, CodeBiasType type, int moremessagesfollow, char *buffer, size_t size); 228 size_t MakePhaseBias(const struct PhaseBias *b, PhaseBiasType type, int moremessagesfollow, char *buffer, size_t size); 229 size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size); 230 enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *b, struct VTEC *v, struct PhaseBias *pb, const char *buffer, size_t size, int *bytesused); 237 231 }; 238 232 -
trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
r10992 r10994 823 823 phasebiasSat->Biases[ii].Type = type; 824 824 phasebiasSat->Biases[ii].Bias = pbSig.bias; 825 phasebiasSat->Biases[ii]. SignalIntegerIndicator = pbSig.integerIndicator;826 phasebiasSat->Biases[ii]. SignalsWideLaneIntegerIndicator = pbSig.wlIndicator;827 phasebiasSat->Biases[ii]. SignalDiscontinuityCounter = pbSig.discontinuityCounter;825 phasebiasSat->Biases[ii].IntegerIndicator = pbSig.integerIndicator; 826 phasebiasSat->Biases[ii].WidelaneGroupIndicator = pbSig.wlIndicator; 827 phasebiasSat->Biases[ii].DiscontinuityCounter = pbSig.discontinuityCounter; 828 828 if (_bsx) { 829 829 QString obsCode = 'L' + pbSig.type;
Note:
See TracChangeset
for help on using the changeset viewer.
