Changeset 10987 in ntrip
- Timestamp:
- Aug 11, 2026, 2:18:53 PM (28 hours ago)
- Location:
- trunk/BNC/src
- Files:
-
- 6 edited
-
RTCM3/clock_and_orbit/clock_orbit.h (modified) (9 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_igs.cpp (modified) (32 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_igs.h (modified) (2 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (modified) (27 diffs)
-
RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (modified) (41 diffs)
-
bncversion.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
r10828 r10987 454 454 455 455 /* GNSS macros - Header part */ 456 #define T_RTCM_MESSAGE_NUMBER(a) ADDBITS(12, a) /* DF002 */ 457 #define T_IGS_SSR_VERSION(a) ADDBITS( 3, a) /* IDF001 */ 458 #define T_IGS_MESSAGE_NUMBER(a) ADDBITS( 8, a) /* IDF002 */ 459 #define T_SSR_EPOCH_TIME(a) ADDBITS(20, a) /* DF385 IDF003 */ //T_GPS_EPOCH_TIME(a) 460 #define T_GLONASS_EPOCH_TIME(a) ADDBITS(17, a) /* DF */ 456 #define T_RTCM_MESSAGE_NUMBER(a) ADDBITS(12, a) /* DF002 */ 457 #define T_IGS_SSR_VERSION(a) ADDBITS( 3, a) /* IDF001 */ 458 #define T_IGS_MESSAGE_NUMBER(a) ADDBITS( 8, a) /* IDF002 */ 459 460 #define T_GPS_EPOCH_TIME(a) ADDBITS(20, a) /* IDF003 DF385 DF458 DF460 DF465*/ 461 #define T_GLONASS_EPOCH_TIME(a) ADDBITS(17, a) /* DF386 */ 461 462 462 463 #define T_SSR_UPDATE_INTERVAL(a) ADDBITS( 4, a) /* DF391, IDF004 */ … … 469 470 470 471 /* GNSS macros - Satellite specific part */ 471 #define T_GNSS_SATELLITE_ID(a) ADDBITS( 6, a) /* IDF011 */ 472 #define T_GPS_SATELLITE_ID(a) ADDBITS( 6, a) /* DF068 */ 473 #define T_QZSS_SATELLITE_ID(a) ADDBITS( 4, a) /* DF249 */ 474 #define T_GLONASS_SATELLITE_ID(a) ADDBITS( 5, a) /* DF */ 475 #define T_GNSS_IOD(a) ADDBITS( 8, a) /* IDF012 */ 476 #define T_GPS_IODE(a) ADDBITS( 8, a) /* DF071 */ 477 #define T_GLONASS_IOD(a) ADDBITS( 8, a) /* DF239 */ 478 #define T_GALILEO_IOD(a) ADDBITS(10, a) /* DF459 */ 479 #define T_SBAS_T0MOD(a) ADDBITS( 9, (a/16)) /* DF468 */ 480 #define T_SBAS_IODCRC(a) ADDBITS(24, a) /* DF469 */ 481 #define T_BDS_TOEMOD(a) ADDBITS(10, (a/8)) /* DF470 */ 482 #define T_BDS_IOD(a) ADDBITS( 8, a) /* DF471 */ 472 #define T_GPS_SATELLITE_ID(a) ADDBITS( 6, a) /* IDF011 DF068 DF488 */ 473 #define T_QZSS_SATELLITE_ID(a) ADDBITS( 4, a) /* DF249 */ 474 #define T_GLONASS_SATELLITE_ID(a) ADDBITS( 5, a) /* DF384 (old RTCM) */ 475 #define T_GLONASS_SATELLITE_ID_NEW(a) ADDBITS( 6, a) /* DF (new RTCM) */ 476 #define T_GPS_IODE(a) ADDBITS( 8, a) /* IDF012 DF071 */ 477 #define T_GLONASS_IOD(a) ADDBITS( 8, a) /* DF239 */ 478 #define T_GALILEO_IOD(a) ADDBITS(10, a) /* DF459 */ 479 #define T_SBAS_T0MOD(a) ADDBITS( 9, (a/16)) /* DF468 */ 480 #define T_SBAS_IODCRC(a) ADDBITS(24, a) /* DF469 */ 481 #define T_BDS_TOEMOD(a) ADDBITS(10, (a/8)) /* DF470 */ 482 #define T_BDS_IOD(a) ADDBITS( 8, a) /* DF471 */ 483 483 484 484 /* Orbit Corrections */ … … 497 497 498 498 /* Biases */ 499 #define T_NO_OF_BIASES(a) ADDBITS(5, a) /* DF, DF IDF023 */ //_NO_OF_CODE_BIASES(a)T_NO_OF_PHASE_BIASES(a) 500 499 #define T_NO_OF_BIASES(a) ADDBITS(5, a) /* DF479 DF379 IDF023 */ 501 500 #define T_GNSS_SIGNAL_IDENTIFIER(a) ADDBITS(5, a) /* DF380, IDF024 */ 502 501 #define T_CODE_BIAS(a) SCALEADDBITS(14, 100.0, a) /* DF383, IDF025 */ … … 506 505 507 506 /* Phase specific part of GNSS phase bias message */ 508 #define T_INTEGER_INDICATOR(a) ADDBITS( 1, a) /* DF483, IDF029 */ 509 #define T_WIDE_LANE_INDICATOR(a) ADDBITS( 2, a) /* DF484, IDF030 */ 510 #define T_DISCONTINUITY_COUNTER(a) ADDBITS( 4, a) /* DF485, IDF031 */ 511 #define T_DISPERSIVE_BIAS_INDICATOR(a) ADDBITS( 1, a) /* DF486, IDF032 */ 512 #define T_MW_CONSISTENCY_INDICATOR(a) ADDBITS( 1, a) /* DF487, IDF033 */ 507 #define T_INTEGER_INDICATOR(a) ADDBITS(1, a) /* DF483, IDF029 */ 508 #define T_WIDE_LANE_INDICATOR(a) ADDBITS(2, a) /* DF484, IDF030 */ 509 #define T_DISCONTINUITY_COUNTER(a) ADDBITS(4, a) /* DF485, IDF031 */ 510 #define T_DISPERSIVE_BIAS_INDICATOR(a) ADDBITS(1, a) /* DF486 (old RTCM), IDF032 */ 511 #define T_YAW_INFO_INDICATOR(a) ADDBITS(1, a) /* DF486 (new RTCM) */ 512 #define T_MW_CONSISTENCY_INDICATOR(a) ADDBITS(1, a) /* DF487 (old RTCM), IDF033 */ 513 #define T_EXTENDED_PHASE_BIAS_ID(a) ADDBITS(4, a) /* DF+002 (new RTCM) */ 513 514 514 515 /* URA */ 515 #define T_SSR_URA(a) ADDBITS( 6, a) /* DF389, IDF034 */ 516 #define T_SSR_URA(a) ADDBITS( 6, a) /* DF389, IDF034 */ 517 518 /* Antenna Information*/ 519 #define T_SATELLITE_ANTENNA_IOD(a) ADDBITS(6, a) /* DF+010 (new RTCM) */ 520 #define T_PHASE_CENTER_INFO_INDICATOR(a) ADDBITS(1, a) /* DF+011 (new RTCM) */ 521 #define T_GROUP_DELAY_INFO_INDICATOR(a) ADDBITS(1, a) /* DF+012 (new RTCM) */ 522 #define T_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a) ADDBITS(1, a) /* DF+013 (new RTCM) */ 523 #define T_MAXIMUM_OFF_NADIR_ANGLE(a) ADDBITS(5, a) /* DF+014 (new RTCM) */ 524 #define T_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) ADDBITS(4, a) /* DF+015 (new RTCM) */ 525 #define T_SATELLITE_SET_INDICATOR(a) ADDBITS(1, a) /* DF+016 (new RTCM) */ 526 #define T_FREQUENCY_SET_INDICATOR(a) ADDBITS(1, a) /* DF+017 (new RTCM) */ 527 #define T_GNSS_FREQUENCY_MASK(a) ADDBITS(6, a) /* DF+018 (new RTCM) */ 528 #define T_NADIR_CORR_INDICATOR(a) ADDBITS(1, a) /* DF+019 (new RTCM) */ 529 #define T_NADIR_CORRECTION(a) ADDBITS(12, a) /* DF+020 (new RTCM) */ 530 #define T_NADIR_ANGLE_DEPENDENT_CORRECTION(a) SCALEADDBITS(3 + T_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a), 1000.0 a) /* DF+021 (new RTCM) NOT COMPLETED: can be extended up to 15/18 Bits*/ 531 532 /* Grid Messages */ 533 #define T_GRID_ID(a) ADDBITS(10, a) /* DF+022 (new RTCM) */ 534 #define T_GRID_TYPE(a) ADDBITS(3 , a) /* DF+023 (new RTCM) */ 535 #define T_LATITUDE_OF_REFERENCE_POINT(a) SCALEADDBITS(18, 1000.0, a) /* DF+024 (new RTCM) */ 536 #define T_LONGITUDE_OF_REFERENCE_POINT(a) SCALEADDBITS(19, 1000.0, a) /* DF+025 (new RTCM) */ 537 #define T_ELLIPSOIDAL_HEIGHT_OF_REFERENCE_POINT(a) SCALEADDBITS(10, 1/12.5, a+1000.0) /* DF+026 (new RTCM) */ 538 #define T_NUMNBER_OF_RELATIVE_POINTS(a) ADDBITS(8, a) /* DF+027 (new RTCM) */ 539 #define T_RELATIVE_LATITUDE(a) SCALEADDBITS(13, 1000.0, a) /* DF+028 (new RTCM) */ 540 #define T_RELATIVE_LONGITUDE(a) SCALEADDBITS(14, 1000.0, a) /* DF+029 (new RTCM) */ 541 #define T_RELATIVE_HIGHT(a) SCALEADDBITS(9, 1/12.5, a) /* DF+030 (new RTCM) */ 542 #define T_NUMBER_OF_ROWS_4_LATITIDE_DIRECTION(a) ADDBITS(6, a) /* DF+031 (new RTCM) */ 543 #define T_NUMBER_OF_ROWS_4_LONGITUDE_DIRECTION(a) ADDBITS(6, a) /* DF+032 (new RTCM) */ 544 #define T_GRID_STEP_SIZE_4_LATITIDE_DIRECTION(a) SCALEADDBITS(9, 100.0, a) /* DF+031 (new RTCM) */ 545 #define T_GRID_STEP_SIZE_4_LONGITUDE_DIRECTION(a) SCALEADDBITS(10, 100.0, a) /* DF+032 (new RTCM) */ 546 547 548 #define LATITUDE_OF_REFERENCE_POINT SCALEADDBITS() /* DF+028 (new RTCM) */ 549 #define LATITUDE_OF_REFERENCE_POINT SCALEADDBITS() /* DF+029 (new RTCM) */ 550 #define LATITUDE_OF_REFERENCE_POINT SCALEADDBITS() /* DF+030 (new RTCM) */ 551 516 552 517 553 /* Ionosphere */ 518 #define T_NO_IONO_LAYERS(a) ADDBITS( 2, a-1)/* DF472, IDF035 */554 #define T_NO_IONO_LAYERS(a) ADDBITS(2, a-1) /* DF472, IDF035 */ 519 555 #define T_IONO_HEIGHT(a) SCALEADDBITS( 8, 1/10000.0, a) /* DF473, IDF036 */ 520 #define T_IONO_DEGREE(a) ADDBITS( 4, a-1)/* DF474, IDF037 */521 #define T_IONO_ORDER(a) ADDBITS( 4, a-1)/* DF475, IDF038 */556 #define T_IONO_DEGREE(a) ADDBITS(4, a-1) /* DF474, IDF037 */ 557 #define T_IONO_ORDER(a) ADDBITS(4, a-1) /* DF475, IDF038 */ 522 558 #define T_IONO_COEFF_C(a) SCALEADDBITS(16, 200.0, a) /* DF476, IDF039 */ 523 559 #define T_IONO_COEFF_S(a) SCALEADDBITS(16, 200.0, a) /* DF477, IDF040 */ 524 560 #define T_VTEC_QUALITY_INDICATOR(a) SCALEADDBITS( 9, 20.0, a) /* DF478, IDF041 */ 561 525 562 526 563 static double URAToValue(int ura) { … … 548 585 #define DECODESTART \ 549 586 int numbits=0; \ 550 uint64_t bitbuffer=0; 587 uint64_t bitbuffer=0; 551 588 552 589 #define LOADSSRBITS(a) { \ … … 598 635 599 636 /* GNSS macros - Header part */ 600 #define G_RTCM_MESSAGE_NUMBER(a) GETSSRBITS(a, 601 #define G_IGS_MESSAGE_NUMBER(a) GETSSRBITS(a, 602 #define G_IGS_SSR_VERSION(a) GETSSRBITS(a, 603 #define G_SSR_EPOCH_TIME(a) GETSSRBITS(a, 20) /*DF385 IDF003 */ 604 #define G_ SSR_EPOCH_TIME_CHECK(a, b) {unsigned int temp;GETSSRBITS(temp, 20) \605 if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} 606 #define G_G LONASS_EPOCH_TIME(a, b){unsigned int temp; GETSSRBITS(temp,17) \607 if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} 637 #define G_RTCM_MESSAGE_NUMBER(a) GETSSRBITS(a,12) /* DF002 */ 638 #define G_IGS_MESSAGE_NUMBER(a) GETSSRBITS(a, 8) /* IDF002 */ 639 #define G_IGS_SSR_VERSION(a) GETSSRBITS(a, 3) /* IDF001 */ 640 641 #define G_GPS_EPOCH_TIME(a) GETSSRBITS(a,20) /* IDF003 DF385 DF458 DF460 DF465*/ 642 #define G_GLONASS_EPOCH_TIME(a) GETSSRBITS(a,17) /* DF386 */ 643 #define G_GPS_EPOCH_TIME_CHECK(a, b) {unsigned int temp; GETSSRBITS(temp, 20) if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} 644 #define G_GLONASS_EPOCH_TIME_CHECK(a, b) {unsigned int temp; GETSSRBITS(temp, 17) if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} 608 645 609 646 #define G_SSR_UPDATE_INTERVAL(a) GETSSRBITS(a, 4) /* DF391, IDF004 */ … … 616 653 617 654 /* GNSS macros - Satellite specific part */ 618 #define G_GNSS_SATELLITE_ID(a) GETSSRBITS(a, 6) /* DF068, IDF011 */ 619 #define G_GLONASS_SATELLITE_ID(a) GETSSRBITS(a, 5) /* DF */ 620 #define G_QZSS_SATELLITE_ID(a) GETSSRBITS(a, 4) /* DF249 */ 621 622 #define G_GNSS_IOD(a) GETSSRBITS(a, 8) /*DF071, DF237,DF471 IDF012 */ 655 #define G_GPS_SATELLITE_ID(a) GETSSRBITS(a, 6) /* IDF011 DF068 DF488 */ 656 #define G_GLONASS_SATELLITE_ID(a) GETSSRBITS(a, 5) /* DF384 */ 657 #define G_GLONASS_SATELLITE_ID_NEW(a) GETSSRBITS(a, 6) /* DF*/ 658 #define G_QZSS_SATELLITE_ID(a) GETSSRBITS(a, 4) /* DF249 */ 659 660 #define G_GPS_IODE(a) GETSSRBITS(a, 8) /* DF071, DF467, IDF012 */ 623 661 #define G_GALILEO_IOD(a) GETSSRBITS(a, 10) /* DF459 */ 662 624 663 #define G_SBAS_T0MOD(a) GETSSRBITSFACTOR(a, 9, 16) /* DF468 */ 625 664 #define G_SBAS_IODCRC(a) GETSSRBITS(a, 24) /* DF469 */ … … 641 680 642 681 /* Biases */ 643 #define G_NO_OF_BIASES(a) GETSSRBITS(a, 5) /* DF , DFIDF023 */682 #define G_NO_OF_BIASES(a) GETSSRBITS(a, 5) /* DF479 DF379 IDF023 */ 644 683 #define G_GNSS_SIGNAL_IDENTIFIER(a) GETSSRBITS(a, 5) /* DF IDF024 */ 645 684 #define G_CODE_BIAS(a) GETSSRFLOATSIGN(a, 14, 1/100.0) /* DF383, IDF025 */ … … 649 688 650 689 /* Phase specific part of GNSS phase bias message */ 651 #define G_INTEGER_INDICATOR(a) GETSSRBITS(a, 1) /* DF483, IDF029 */ 652 #define G_WIDE_LANE_INDICATOR(a) GETSSRBITS(a, 2) /* DF484, IDF030 */ 653 #define G_DISCONTINUITY_COUNTER(a) GETSSRBITS(a, 4) /* DF485, IDF031 */ 654 #define G_DISPERSIVE_BIAS_INDICATOR(a) GETSSRBITS(a, 1) /* DF486, IDF032 */ 655 #define G_MW_CONSISTENCY_INDICATOR(a) GETSSRBITS(a, 1) /* DF487, IDF033 */ 690 #define G_INTEGER_INDICATOR(a) GETSSRBITS(a, 1) /* DF483, IDF029 */ 691 #define G_WIDE_LANE_INDICATOR(a) GETSSRBITS(a, 2) /* DF484, IDF030 */ 692 #define G_DISCONTINUITY_COUNTER(a) GETSSRBITS(a, 4) /* DF485, IDF031 */ 693 #define G_DISPERSIVE_BIAS_INDICATOR(a) GETSSRBITS(a, 1) /* DF486 (old RTCM), IDF032 */ 694 #define G_YAW_INFO_INDICATOR(a) GETSSRBITS(a, 1) /* DF486 (new RTCM) */ 695 #define G_MW_CONSISTENCY_INDICATOR(a) GETSSRBITS(a, 1) /* DF487, IDF033 */ 696 #define G_EXTENDED_PHASE_BIAS_ID(a) GETSSRBITS(4, a) /* DF?? (new RTCM)*/ 656 697 657 698 /* URA */ 658 #define G_SSR_URA(a) {int temp; GETSSRBITS(temp, 6) \ 659 (a) = URAToValue(temp);} /* DF389, IDF034 */ 660 699 #define G_SSR_URA(a) {int temp; GETSSRBITS(temp, 6) \ 700 (a) = URAToValue(temp);} /* DF389, IDF034 */ 701 702 /* Antenna Information*/ 703 #define G_SATELLITE_ANTENNA_IOD(a) GETSSRBITS(a, 6) /* DF+010 (new RTCM) */ 704 #define G_PHASE_CENTER_INFO_INDICATORD(a) GETSSRBITS(a, 1) /* DF+011 (new RTCM) */ 705 #define G_GROUP_DELAY_INFO_INDICATOR(a) GETSSRBITS(a, 1) /* DF+012 (new RTCM) */ 706 #define G_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a) GETSSRBITS(a, 1) /* DF+013 (new RTCM) */ 707 #define G_MAXIMUM_OFF_NADIR_ANGLE(a) GETSSRBITS(a, 5) /* DF+014 (new RTCM) */ 708 #define G_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) GETSSRBITS(a, 4) /* DF+015 (new RTCM) */ 709 #define G_SATELLITE_SET_INDICATOR(a) GETSSRBITS(a, 1) /* DF+016 (new RTCM) */ 710 #define G_FREQUENCY_SET_INDICATOR (a) GETSSRBITS(a, 1) /* DF+017 (new RTCM) */ 711 #define G_GNSS_FREQUENCY_MASK (a) GETSSRBITS(a, 6) /* DF+018 (new RTCM) */ 712 #define G_NADIR_CORR_INDICATOR(a) GETSSRBITS(a, 1) /* DF+019 (new RTCM) */ 713 #define G_NADIR_CORRECTION(a) GETSSRBITS(a, 12) /* DF+020 (new RTCM) */ 714 #define G_NADIR_ANGLE_DEPENDENT_CORRECTION(a) GETSSRBITS(a, 3 + G_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a)) /* DF+021 (new RTCM) */ 715 661 716 /* Ionosphere */ 662 717 #define G_NO_IONO_LAYERS(a) {unsigned int temp; GETSSRBITS(temp, 2) a = temp+1;} /* DF472, IDF035 */ -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp
r10829 r10987 70 70 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 71 71 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_ORBIT) 72 T_ SSR_EPOCH_TIME(co->EpochTime[s])72 T_GPS_EPOCH_TIME(co->EpochTime[s]) 73 73 T_SSR_UPDATE_INTERVAL(co->UpdateInterval) 74 74 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 79 79 T_NO_OF_SATELLITES(co->NumberOfSat[s]) 80 80 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 81 T_G NSS_SATELLITE_ID(co->Sat[i].ID)82 T_G NSS_IOD(co->Sat[i].IOD)81 T_GPS_SATELLITE_ID(co->Sat[i].ID) 82 T_GPS_IODE(co->Sat[i].IOD) 83 83 T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial) 84 84 T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack) … … 95 95 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 96 96 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_CLOCK) 97 T_ SSR_EPOCH_TIME(co->EpochTime[s])97 T_GPS_EPOCH_TIME(co->EpochTime[s]) 98 98 T_SSR_UPDATE_INTERVAL(co->UpdateInterval) 99 99 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 103 103 T_NO_OF_SATELLITES(co->NumberOfSat[s]) 104 104 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 105 T_G NSS_SATELLITE_ID(co->Sat[i].ID)105 T_GPS_SATELLITE_ID(co->Sat[i].ID) 106 106 T_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0) 107 107 T_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1) … … 127 127 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 128 128 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_COMBINED) 129 T_ SSR_EPOCH_TIME(co->EpochTime[s])129 T_GPS_EPOCH_TIME(co->EpochTime[s]) 130 130 T_SSR_UPDATE_INTERVAL(co->UpdateInterval) 131 131 #ifdef SPLITBLOCK … … 145 145 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 146 146 #endif 147 T_G NSS_SATELLITE_ID(co->Sat[i].ID)148 T_G NSS_IOD(co->Sat[i].IOD)147 T_GPS_SATELLITE_ID(co->Sat[i].ID) 148 T_GPS_IODE(co->Sat[i].IOD) 149 149 T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial) 150 150 T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack) … … 170 170 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 171 171 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_HR) 172 T_ SSR_EPOCH_TIME(co->EpochTime[s])172 T_GPS_EPOCH_TIME(co->EpochTime[s]) 173 173 T_SSR_UPDATE_INTERVAL(co->UpdateInterval) 174 174 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 178 178 T_NO_OF_SATELLITES(co->NumberOfSat[s]) 179 179 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 180 T_G NSS_SATELLITE_ID(co->Sat[i].ID)180 T_GPS_SATELLITE_ID(co->Sat[i].ID) 181 181 T_HR_CLOCK_CORRECTION(co->Sat[i].hrclock) 182 182 } … … 188 188 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 189 189 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_URA) 190 T_ SSR_EPOCH_TIME(co->EpochTime[s])190 T_GPS_EPOCH_TIME(co->EpochTime[s]) 191 191 T_SSR_UPDATE_INTERVAL(co->UpdateInterval) 192 192 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 196 196 T_NO_OF_SATELLITES(co->NumberOfSat[s]) 197 197 for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { 198 T_G NSS_SATELLITE_ID(co->Sat[i].ID)198 T_GPS_SATELLITE_ID(co->Sat[i].ID) 199 199 T_SSR_URA(ValueToURA(co->Sat[i].UserRangeAccuracy)) 200 200 } … … 217 217 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 218 218 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_CBIAS) 219 T_ SSR_EPOCH_TIME(b->EpochTime[s])219 T_GPS_EPOCH_TIME(b->EpochTime[s]) 220 220 T_SSR_UPDATE_INTERVAL(b->UpdateInterval) 221 221 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 225 225 T_NO_OF_SATELLITES(b->NumberOfSat[s]) 226 226 for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { 227 T_G NSS_SATELLITE_ID(b->Sat[i].ID)227 T_GPS_SATELLITE_ID(b->Sat[i].ID) 228 228 T_NO_OF_BIASES(b->Sat[i].NumberOfCodeBiases) 229 229 for (j = 0; j < b->Sat[i].NumberOfCodeBiases; ++j) { … … 250 250 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 251 251 T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_PBIAS) 252 T_ SSR_EPOCH_TIME(b->EpochTime[s])252 T_GPS_EPOCH_TIME(b->EpochTime[s]) 253 253 T_SSR_UPDATE_INTERVAL(b->UpdateInterval) 254 254 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 260 260 T_NO_OF_SATELLITES(b->NumberOfSat[s]) 261 261 for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { 262 T_G NSS_SATELLITE_ID(b->Sat[i].ID)262 T_GPS_SATELLITE_ID(b->Sat[i].ID) 263 263 T_NO_OF_BIASES(b->Sat[i].NumberOfPhaseBiases) 264 264 T_YAW_ANGLE(b->Sat[i].YawAngle) … … 287 287 T_IGS_SSR_VERSION(IGS_SSR_VERSION) 288 288 T_IGS_MESSAGE_NUMBER(VTEC_BASE) 289 T_ SSR_EPOCH_TIME(v->EpochTime)289 T_GPS_EPOCH_TIME(v->EpochTime) 290 290 T_SSR_UPDATE_INTERVAL(v->UpdateInterval) 291 291 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 361 361 return GCOBR_NOVTECPARAMETER; 362 362 memset(v, 0, sizeof(*v)); 363 G_ SSR_EPOCH_TIME(v->EpochTime)363 G_GPS_EPOCH_TIME(v->EpochTime) 364 364 G_SSR_UPDATE_INTERVAL(v->UpdateInterval) 365 365 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 415 415 return GCOBR_NOCLOCKORBITPARAMETER; 416 416 co->messageType = igstype; 417 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])417 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 418 418 G_SSR_UPDATE_INTERVAL(co->UpdateInterval) 419 419 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 430 430 #endif 431 431 for (i = 0; i < nums; ++i) { 432 G_G NSS_SATELLITE_ID(id)432 G_GPS_SATELLITE_ID(id) 433 433 for (pos = satoffset[s]; 434 434 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 440 440 ++co->NumberOfSat[s]; 441 441 co->Sat[pos].ID = id; 442 G_G NSS_IOD(co->Sat[pos].IOD)442 G_GPS_IODE(co->Sat[pos].IOD) 443 443 G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial) 444 444 G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack) … … 461 461 return GCOBR_NOCLOCKORBITPARAMETER; 462 462 co->messageType = igstype; 463 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])463 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 464 464 G_SSR_UPDATE_INTERVAL(co->UpdateInterval) 465 465 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 475 475 #endif 476 476 for (i = 0; i < nums; ++i) { 477 G_G NSS_SATELLITE_ID(id)477 G_GPS_SATELLITE_ID(id) 478 478 for (pos = satoffset[s]; 479 479 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 499 499 return GCOBR_NOCLOCKORBITPARAMETER; 500 500 co->messageType = igstype; 501 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])501 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 502 502 G_SSR_UPDATE_INTERVAL(co->UpdateInterval) 503 503 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 515 515 #endif 516 516 for (i = 0; i < nums; ++i) { 517 G_G NSS_SATELLITE_ID(id)517 G_GPS_SATELLITE_ID(id) 518 518 for (pos = satoffset[s]; 519 519 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 525 525 ++co->NumberOfSat[s]; 526 526 co->Sat[pos].ID = id; 527 G_G NSS_IOD(co->Sat[pos].IOD)527 G_GPS_IODE(co->Sat[pos].IOD) 528 528 G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial) 529 529 G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack) … … 549 549 return GCOBR_NOCLOCKORBITPARAMETER; 550 550 co->messageType = igstype; 551 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])551 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 552 552 G_SSR_UPDATE_INTERVAL(co->UpdateInterval) 553 553 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 563 563 #endif 564 564 for (i = 0; i < nums; ++i) { 565 G_G NSS_SATELLITE_ID(id)565 G_GPS_SATELLITE_ID(id) 566 566 for (pos = satoffset[s]; 567 567 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 584 584 return GCOBR_NOCLOCKORBITPARAMETER; 585 585 co->messageType = igstype; 586 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])586 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 587 587 G_SSR_UPDATE_INTERVAL(co->UpdateInterval) 588 588 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 598 598 #endif 599 599 for (i = 0; i < nums; ++i) { 600 G_G NSS_SATELLITE_ID(id)600 G_GPS_SATELLITE_ID(id) 601 601 for (pos = satoffset[s]; 602 602 pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; … … 619 619 return GCOBR_NOCODEBIASPARAMETER; 620 620 b->messageType = igstype; 621 G_ SSR_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s])621 G_GPS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) 622 622 G_SSR_UPDATE_INTERVAL(b->UpdateInterval) 623 623 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 632 632 #endif 633 633 for (i = 0; i < nums; ++i) { 634 G_G NSS_SATELLITE_ID(id)634 G_GPS_SATELLITE_ID(id) 635 635 for (pos = satoffset[s]; 636 636 pos < satoffset[s] + b->NumberOfSat[s] && b->Sat[pos].ID != id; … … 664 664 return GCOBR_NOPHASEBIASPARAMETER; 665 665 pb->messageType = igstype; 666 G_ SSR_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s])666 G_GPS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) 667 667 G_SSR_UPDATE_INTERVAL(pb->UpdateInterval) 668 668 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 680 680 #endif 681 681 for (i = 0; i < nums; ++i) { 682 G_G NSS_SATELLITE_ID(id)682 G_GPS_SATELLITE_ID(id) 683 683 for (pos = satoffset[s]; 684 684 pos < satoffset[s] + pb->NumberOfSat[s] && pb->Sat[pos].ID != id; -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h
r10829 r10987 140 140 CODETYPE_GPS_L5_Q = 15; 141 141 142 143 144 145 146 142 CODETYPE_GLONASS_L1_CA = 0; 147 143 CODETYPE_GLONASS_L1_P = 1; … … 154 150 CODETYPE_GLONASS_L3_I = 8; 155 151 CODETYPE_GLONASS_L3_Q = 9; 156 157 158 159 152 160 153 CODETYPE_GALILEO_E1_A = 0; -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp
r10829 r10987 76 76 case CLOCKORBIT_SATSBAS: 77 77 case CLOCKORBIT_SATBDS: 78 T_ SSR_EPOCH_TIME(co->EpochTime[s])78 T_GPS_EPOCH_TIME(co->EpochTime[s]) 79 79 break; 80 80 case CLOCKORBIT_SATGLONASS: … … 136 136 case CLOCKORBIT_SATSBAS: 137 137 case CLOCKORBIT_SATBDS: 138 T_ SSR_EPOCH_TIME(co->EpochTime[s])138 T_GPS_EPOCH_TIME(co->EpochTime[s]) 139 139 break; 140 140 case CLOCKORBIT_SATGLONASS: … … 190 190 case CLOCKORBIT_SATSBAS: 191 191 case CLOCKORBIT_SATBDS: 192 T_ SSR_EPOCH_TIME(co->EpochTime[s])192 T_GPS_EPOCH_TIME(co->EpochTime[s]) 193 193 break; 194 194 case CLOCKORBIT_SATGLONASS: … … 269 269 case CLOCKORBIT_SATSBAS: 270 270 case CLOCKORBIT_SATBDS: 271 T_ SSR_EPOCH_TIME(co->EpochTime[s])271 T_GPS_EPOCH_TIME(co->EpochTime[s]) 272 272 break; 273 273 case CLOCKORBIT_SATGLONASS: … … 309 309 case CLOCKORBIT_SATSBAS: 310 310 case CLOCKORBIT_SATBDS: 311 T_ SSR_EPOCH_TIME(co->EpochTime[s])311 T_GPS_EPOCH_TIME(co->EpochTime[s]) 312 312 break; 313 313 case CLOCKORBIT_SATGLONASS: … … 360 360 case CLOCKORBIT_SATSBAS: 361 361 case CLOCKORBIT_SATBDS: 362 T_ SSR_EPOCH_TIME(b->EpochTime[s])362 T_GPS_EPOCH_TIME(b->EpochTime[s]) 363 363 break; 364 364 case CLOCKORBIT_SATGLONASS: … … 415 415 case CLOCKORBIT_SATSBAS: 416 416 case CLOCKORBIT_SATBDS: 417 T_ SSR_EPOCH_TIME(b->EpochTime[s])417 T_GPS_EPOCH_TIME(b->EpochTime[s]) 418 418 break; 419 419 case CLOCKORBIT_SATGLONASS: … … 470 470 INITBLOCK 471 471 T_RTCM_MESSAGE_NUMBER(VTEC_BASE) 472 T_ SSR_EPOCH_TIME(v->EpochTime)472 T_GPS_EPOCH_TIME(v->EpochTime) 473 473 T_SSR_UPDATE_INTERVAL(v->UpdateInterval) 474 474 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 538 538 return GCOBR_NOVTECPARAMETER; 539 539 memset(v, 0, sizeof(*v)); 540 G_ SSR_EPOCH_TIME(v->EpochTime)540 G_GPS_EPOCH_TIME(v->EpochTime) 541 541 G_SSR_UPDATE_INTERVAL(v->UpdateInterval) 542 542 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 596 596 case CLOCKORBIT_SATSBAS: 597 597 case CLOCKORBIT_SATBDS: 598 G_ SSR_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s])598 G_GPS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) 599 599 break; 600 600 case CLOCKORBIT_SATGLONASS: 601 G_GLONASS_EPOCH_TIME(pb->EpochTime[s], pb->NumberOfSat[s]) 601 G_GLONASS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) 602 602 break; 603 603 } … … 622 622 case CLOCKORBIT_SATSBAS: 623 623 case CLOCKORBIT_SATBDS: 624 G_G NSS_SATELLITE_ID(id)624 G_GPS_SATELLITE_ID(id) 625 625 break; 626 626 case CLOCKORBIT_SATQZSS: … … 688 688 case CLOCKORBIT_SATSBAS: 689 689 case CLOCKORBIT_SATBDS: 690 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])690 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 691 691 break; 692 692 case CLOCKORBIT_SATGLONASS: 693 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 693 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 694 694 break; 695 695 } … … 713 713 case CLOCKORBIT_SATSBAS: 714 714 case CLOCKORBIT_SATBDS: 715 G_G NSS_SATELLITE_ID(id)715 G_GPS_SATELLITE_ID(id) 716 716 break; 717 717 case CLOCKORBIT_SATQZSS: … … 735 735 case CLOCKORBIT_SATGPS: 736 736 case CLOCKORBIT_SATQZSS: 737 G_GNSS_IOD(co->Sat[pos].IOD)737 G_GPS_IODE(co->Sat[pos].IOD) 738 738 break; 739 739 case CLOCKORBIT_SATGLONASS: 740 G_G NSS_IOD(co->Sat[pos].IOD)740 G_GPS_IODE(co->Sat[pos].IOD) 741 741 break; 742 742 case CLOCKORBIT_SATGALILEO: … … 749 749 case CLOCKORBIT_SATBDS: 750 750 G_BDS_TOEMOD(co->Sat[pos].toe) 751 G_G NSS_IOD(co->Sat[pos].IOD)751 G_GPS_IODE(co->Sat[pos].IOD) 752 752 break; 753 753 } … … 778 778 case CLOCKORBIT_SATSBAS: 779 779 case CLOCKORBIT_SATBDS: 780 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])780 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 781 781 break; 782 782 case CLOCKORBIT_SATGLONASS: 783 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 783 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 784 784 break; 785 785 } … … 802 802 case CLOCKORBIT_SATSBAS: 803 803 case CLOCKORBIT_SATBDS: 804 G_G NSS_SATELLITE_ID(id)804 G_GPS_SATELLITE_ID(id) 805 805 break; 806 806 case CLOCKORBIT_SATQZSS: … … 841 841 case CLOCKORBIT_SATSBAS: 842 842 case CLOCKORBIT_SATBDS: 843 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])843 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 844 844 break; 845 845 case CLOCKORBIT_SATGLONASS: 846 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 846 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 847 847 break; 848 848 } … … 867 867 case CLOCKORBIT_SATSBAS: 868 868 case CLOCKORBIT_SATBDS: 869 G_G NSS_SATELLITE_ID(id)869 G_GPS_SATELLITE_ID(id) 870 870 break; 871 871 case CLOCKORBIT_SATQZSS: … … 889 889 case CLOCKORBIT_SATGPS: 890 890 case CLOCKORBIT_SATQZSS: 891 G_G NSS_IOD(co->Sat[pos].IOD)891 G_GPS_IODE(co->Sat[pos].IOD) 892 892 break; 893 893 case CLOCKORBIT_SATGLONASS: 894 G_G NSS_IOD(co->Sat[pos].IOD)894 G_GPS_IODE(co->Sat[pos].IOD) 895 895 break; 896 896 case CLOCKORBIT_SATGALILEO: … … 903 903 case CLOCKORBIT_SATBDS: 904 904 G_BDS_TOEMOD(co->Sat[pos].toe) 905 G_G NSS_IOD(co->Sat[pos].IOD)905 G_GPS_IODE(co->Sat[pos].IOD) 906 906 break; 907 907 } … … 935 935 case CLOCKORBIT_SATSBAS: 936 936 case CLOCKORBIT_SATBDS: 937 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])937 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 938 938 break; 939 939 case CLOCKORBIT_SATGLONASS: 940 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 940 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 941 941 break; 942 942 } … … 959 959 case CLOCKORBIT_SATSBAS: 960 960 case CLOCKORBIT_SATBDS: 961 G_G NSS_SATELLITE_ID(id)961 G_GPS_SATELLITE_ID(id) 962 962 break; 963 963 case CLOCKORBIT_SATQZSS: … … 994 994 case CLOCKORBIT_SATSBAS: 995 995 case CLOCKORBIT_SATBDS: 996 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])996 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 997 997 break; 998 998 case CLOCKORBIT_SATGLONASS: 999 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 999 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 1000 1000 break; 1001 1001 } … … 1018 1018 case CLOCKORBIT_SATSBAS: 1019 1019 case CLOCKORBIT_SATBDS: 1020 G_G NSS_SATELLITE_ID(id)1020 G_GPS_SATELLITE_ID(id) 1021 1021 break; 1022 1022 case CLOCKORBIT_SATQZSS: … … 1053 1053 case CLOCKORBIT_SATSBAS: 1054 1054 case CLOCKORBIT_SATBDS: 1055 G_ SSR_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s])1055 G_GPS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) 1056 1056 break; 1057 1057 case CLOCKORBIT_SATGLONASS: 1058 G_GLONASS_EPOCH_TIME(b->EpochTime[s], b->NumberOfSat[s]) 1058 G_GLONASS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) 1059 1059 break; 1060 1060 } … … 1076 1076 case CLOCKORBIT_SATSBAS: 1077 1077 case CLOCKORBIT_SATBDS: 1078 G_G NSS_SATELLITE_ID(id)1078 G_GPS_SATELLITE_ID(id) 1079 1079 break; 1080 1080 case CLOCKORBIT_SATQZSS: -
trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp
r10829 r10987 75 75 case CLOCKORBIT_SATSBAS: 76 76 case CLOCKORBIT_SATBDS: 77 T_ SSR_EPOCH_TIME(co->EpochTime[s])77 T_GPS_EPOCH_TIME(co->EpochTime[s]) 78 78 break; 79 79 case CLOCKORBIT_SATGLONASS: … … 95 95 break; 96 96 case CLOCKORBIT_SATGLONASS: 97 T_G NSS_SATELLITE_ID(co->Sat[i].ID)97 T_GLONASS_SATELLITE_ID(co->Sat[i].ID) 98 98 T_GLONASS_IOD(co->Sat[i].IOD) 99 99 break; … … 135 135 case CLOCKORBIT_SATSBAS: 136 136 case CLOCKORBIT_SATBDS: 137 T_ SSR_EPOCH_TIME(co->EpochTime[s])137 T_GPS_EPOCH_TIME(co->EpochTime[s]) 138 138 break; 139 139 case CLOCKORBIT_SATGLONASS: … … 159 159 break; 160 160 case CLOCKORBIT_SATGLONASS: 161 T_G NSS_SATELLITE_ID(co->Sat[i].ID)161 T_GLONASS_SATELLITE_ID(co->Sat[i].ID) 162 162 break; 163 163 } … … 189 189 case CLOCKORBIT_SATSBAS: 190 190 case CLOCKORBIT_SATBDS: 191 T_ SSR_EPOCH_TIME(co->EpochTime[s])191 T_GPS_EPOCH_TIME(co->EpochTime[s]) 192 192 break; 193 193 case CLOCKORBIT_SATGLONASS: … … 219 219 break; 220 220 case CLOCKORBIT_SATGLONASS: 221 T_G NSS_SATELLITE_ID(co->Sat[i].ID)221 T_GLONASS_SATELLITE_ID(co->Sat[i].ID) 222 222 T_GLONASS_IOD(co->Sat[i].IOD) 223 223 break; … … 268 268 case CLOCKORBIT_SATSBAS: 269 269 case CLOCKORBIT_SATBDS: 270 T_ SSR_EPOCH_TIME(co->EpochTime[s])270 T_GPS_EPOCH_TIME(co->EpochTime[s]) 271 271 break; 272 272 case CLOCKORBIT_SATGLONASS: … … 292 292 break; 293 293 case CLOCKORBIT_SATGLONASS: 294 T_G NSS_SATELLITE_ID(co->Sat[i].ID)294 T_GLONASS_SATELLITE_ID(co->Sat[i].ID) 295 295 break; 296 296 } … … 308 308 case CLOCKORBIT_SATSBAS: 309 309 case CLOCKORBIT_SATBDS: 310 T_ SSR_EPOCH_TIME(co->EpochTime[s])310 T_GPS_EPOCH_TIME(co->EpochTime[s]) 311 311 break; 312 312 case CLOCKORBIT_SATGLONASS: … … 332 332 break; 333 333 case CLOCKORBIT_SATGLONASS: 334 T_G NSS_SATELLITE_ID(co->Sat[i].ID)334 T_GLONASS_SATELLITE_ID(co->Sat[i].ID) 335 335 break; 336 336 } … … 359 359 case CLOCKORBIT_SATSBAS: 360 360 case CLOCKORBIT_SATBDS: 361 T_ SSR_EPOCH_TIME(b->EpochTime[s])361 T_GPS_EPOCH_TIME(b->EpochTime[s]) 362 362 break; 363 363 case CLOCKORBIT_SATGLONASS: … … 383 383 break; 384 384 case CLOCKORBIT_SATGLONASS: 385 T_G NSS_SATELLITE_ID(b->Sat[i].ID)385 T_GLONASS_SATELLITE_ID(b->Sat[i].ID) 386 386 break; 387 387 } … … 414 414 case CLOCKORBIT_SATSBAS: 415 415 case CLOCKORBIT_SATBDS: 416 T_ SSR_EPOCH_TIME(b->EpochTime[s])416 T_GPS_EPOCH_TIME(b->EpochTime[s]) 417 417 break; 418 418 case CLOCKORBIT_SATGLONASS: … … 440 440 break; 441 441 case CLOCKORBIT_SATGLONASS: 442 T_G NSS_SATELLITE_ID(b->Sat[i].ID)442 T_GLONASS_SATELLITE_ID(b->Sat[i].ID) 443 443 break; 444 444 } … … 469 469 INITBLOCK 470 470 T_RTCM_MESSAGE_NUMBER(VTEC_BASE) 471 T_ SSR_EPOCH_TIME(v->EpochTime)471 T_GPS_EPOCH_TIME(v->EpochTime) 472 472 T_SSR_UPDATE_INTERVAL(v->UpdateInterval) 473 473 T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) … … 537 537 return GCOBR_NOVTECPARAMETER; 538 538 memset(v, 0, sizeof(*v)); 539 G_ SSR_EPOCH_TIME(v->EpochTime)539 G_GPS_EPOCH_TIME(v->EpochTime) 540 540 G_SSR_UPDATE_INTERVAL(v->UpdateInterval) 541 541 G_MULTIPLE_MESSAGE_INDICATOR(mmi) … … 595 595 case CLOCKORBIT_SATSBAS: 596 596 case CLOCKORBIT_SATBDS: 597 G_ SSR_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s])597 G_GPS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) 598 598 break; 599 599 case CLOCKORBIT_SATGLONASS: 600 G_GLONASS_EPOCH_TIME(pb->EpochTime[s], pb->NumberOfSat[s]) 600 G_GLONASS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) 601 601 break; 602 602 } … … 621 621 case CLOCKORBIT_SATSBAS: 622 622 case CLOCKORBIT_SATBDS: 623 G_G NSS_SATELLITE_ID(id)623 G_GPS_SATELLITE_ID(id) 624 624 break; 625 625 case CLOCKORBIT_SATQZSS: … … 627 627 break; 628 628 case CLOCKORBIT_SATGLONASS: 629 G_G NSS_SATELLITE_ID(id)629 G_GLONASS_SATELLITE_ID(id) 630 630 break; 631 631 } … … 687 687 case CLOCKORBIT_SATSBAS: 688 688 case CLOCKORBIT_SATBDS: 689 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])689 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 690 690 break; 691 691 case CLOCKORBIT_SATGLONASS: 692 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 692 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 693 693 break; 694 694 } … … 712 712 case CLOCKORBIT_SATSBAS: 713 713 case CLOCKORBIT_SATBDS: 714 G_G NSS_SATELLITE_ID(id)714 G_GPS_SATELLITE_ID(id) 715 715 break; 716 716 case CLOCKORBIT_SATQZSS: … … 718 718 break; 719 719 case CLOCKORBIT_SATGLONASS: 720 G_G NSS_SATELLITE_ID(id)720 G_GLONASS_SATELLITE_ID(id) 721 721 break; 722 722 } … … 734 734 case CLOCKORBIT_SATGPS: 735 735 case CLOCKORBIT_SATQZSS: 736 G_GNSS_IOD(co->Sat[pos].IOD)736 G_GPS_IODE(co->Sat[pos].IOD) 737 737 break; 738 738 case CLOCKORBIT_SATGLONASS: 739 G_G NSS_IOD(co->Sat[pos].IOD)739 G_GPS_IODE(co->Sat[pos].IOD) 740 740 break; 741 741 case CLOCKORBIT_SATGALILEO: … … 748 748 case CLOCKORBIT_SATBDS: 749 749 G_BDS_TOEMOD(co->Sat[pos].toe) 750 G_G NSS_IOD(co->Sat[pos].IOD)750 G_GPS_IODE(co->Sat[pos].IOD) 751 751 break; 752 752 } … … 777 777 case CLOCKORBIT_SATSBAS: 778 778 case CLOCKORBIT_SATBDS: 779 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])779 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 780 780 break; 781 781 case CLOCKORBIT_SATGLONASS: 782 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 782 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 783 783 break; 784 784 } … … 801 801 case CLOCKORBIT_SATSBAS: 802 802 case CLOCKORBIT_SATBDS: 803 G_G NSS_SATELLITE_ID(id)803 G_GPS_SATELLITE_ID(id) 804 804 break; 805 805 case CLOCKORBIT_SATQZSS: … … 807 807 break; 808 808 case CLOCKORBIT_SATGLONASS: 809 G_G NSS_SATELLITE_ID(id)809 G_GLONASS_SATELLITE_ID(id) 810 810 break; 811 811 } … … 840 840 case CLOCKORBIT_SATSBAS: 841 841 case CLOCKORBIT_SATBDS: 842 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])842 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 843 843 break; 844 844 case CLOCKORBIT_SATGLONASS: 845 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 845 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 846 846 break; 847 847 } … … 866 866 case CLOCKORBIT_SATSBAS: 867 867 case CLOCKORBIT_SATBDS: 868 G_G NSS_SATELLITE_ID(id)868 G_GPS_SATELLITE_ID(id) 869 869 break; 870 870 case CLOCKORBIT_SATQZSS: … … 872 872 break; 873 873 case CLOCKORBIT_SATGLONASS: 874 G_G NSS_SATELLITE_ID(id)874 G_GLONASS_SATELLITE_ID(id) 875 875 break; 876 876 } … … 888 888 case CLOCKORBIT_SATGPS: 889 889 case CLOCKORBIT_SATQZSS: 890 G_GNSS_IOD(co->Sat[pos].IOD)890 G_GPS_IODE(co->Sat[pos].IOD) 891 891 break; 892 892 case CLOCKORBIT_SATGLONASS: 893 G_G NSS_IOD(co->Sat[pos].IOD)893 G_GPS_IODE(co->Sat[pos].IOD) 894 894 break; 895 895 case CLOCKORBIT_SATGALILEO: … … 902 902 case CLOCKORBIT_SATBDS: 903 903 G_BDS_TOEMOD(co->Sat[pos].toe) 904 G_G NSS_IOD(co->Sat[pos].IOD)904 G_GPS_IODE(co->Sat[pos].IOD) 905 905 break; 906 906 } … … 934 934 case CLOCKORBIT_SATSBAS: 935 935 case CLOCKORBIT_SATBDS: 936 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])936 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 937 937 break; 938 938 case CLOCKORBIT_SATGLONASS: 939 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 939 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 940 940 break; 941 941 } … … 958 958 case CLOCKORBIT_SATSBAS: 959 959 case CLOCKORBIT_SATBDS: 960 G_G NSS_SATELLITE_ID(id)960 G_GPS_SATELLITE_ID(id) 961 961 break; 962 962 case CLOCKORBIT_SATQZSS: … … 964 964 break; 965 965 case CLOCKORBIT_SATGLONASS: 966 G_G NSS_SATELLITE_ID(id)966 G_GLONASS_SATELLITE_ID(id) 967 967 break; 968 968 } … … 993 993 case CLOCKORBIT_SATSBAS: 994 994 case CLOCKORBIT_SATBDS: 995 G_ SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s])995 G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 996 996 break; 997 997 case CLOCKORBIT_SATGLONASS: 998 G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) 998 G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) 999 999 break; 1000 1000 } … … 1017 1017 case CLOCKORBIT_SATSBAS: 1018 1018 case CLOCKORBIT_SATBDS: 1019 G_G NSS_SATELLITE_ID(id)1019 G_GPS_SATELLITE_ID(id) 1020 1020 break; 1021 1021 case CLOCKORBIT_SATQZSS: … … 1023 1023 break; 1024 1024 case CLOCKORBIT_SATGLONASS: 1025 G_G NSS_SATELLITE_ID(id)1025 G_GLONASS_SATELLITE_ID(id) 1026 1026 break; 1027 1027 } … … 1052 1052 case CLOCKORBIT_SATSBAS: 1053 1053 case CLOCKORBIT_SATBDS: 1054 G_ SSR_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s])1054 G_GPS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) 1055 1055 break; 1056 1056 case CLOCKORBIT_SATGLONASS: 1057 G_GLONASS_EPOCH_TIME(b->EpochTime[s], b->NumberOfSat[s]) 1057 G_GLONASS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) 1058 1058 break; 1059 1059 } … … 1075 1075 case CLOCKORBIT_SATSBAS: 1076 1076 case CLOCKORBIT_SATBDS: 1077 G_G NSS_SATELLITE_ID(id)1077 G_GPS_SATELLITE_ID(id) 1078 1078 break; 1079 1079 case CLOCKORBIT_SATQZSS: … … 1081 1081 break; 1082 1082 case CLOCKORBIT_SATGLONASS: 1083 G_G NSS_SATELLITE_ID(id)1083 G_GLONASS_SATELLITE_ID(id) 1084 1084 break; 1085 1085 } -
trunk/BNC/src/bncversion.h
r10927 r10987 3 3 #define BNCVERSION_H 4 4 5 #define BNCVERSION "2.13. 7"5 #define BNCVERSION "2.13.8" 6 6 #define BNCPGMNAME "BNC " BNCVERSION 7 7
Note:
See TracChangeset
for help on using the changeset viewer.
