Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (revision 10986) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (revision 10987) @@ -454,9 +454,10 @@ /* GNSS macros - Header part */ -#define T_RTCM_MESSAGE_NUMBER(a) ADDBITS(12, a) /* DF002 */ -#define T_IGS_SSR_VERSION(a) ADDBITS( 3, a) /* IDF001 */ -#define T_IGS_MESSAGE_NUMBER(a) ADDBITS( 8, a) /* IDF002 */ -#define T_SSR_EPOCH_TIME(a) ADDBITS(20, a) /* DF385 IDF003 */ //T_GPS_EPOCH_TIME(a) -#define T_GLONASS_EPOCH_TIME(a) ADDBITS(17, a) /* DF */ +#define T_RTCM_MESSAGE_NUMBER(a) ADDBITS(12, a) /* DF002 */ +#define T_IGS_SSR_VERSION(a) ADDBITS( 3, a) /* IDF001 */ +#define T_IGS_MESSAGE_NUMBER(a) ADDBITS( 8, a) /* IDF002 */ + +#define T_GPS_EPOCH_TIME(a) ADDBITS(20, a) /* IDF003 DF385 DF458 DF460 DF465*/ +#define T_GLONASS_EPOCH_TIME(a) ADDBITS(17, a) /* DF386 */ #define T_SSR_UPDATE_INTERVAL(a) ADDBITS( 4, a) /* DF391, IDF004 */ @@ -469,16 +470,15 @@ /* GNSS macros - Satellite specific part */ -#define T_GNSS_SATELLITE_ID(a) ADDBITS( 6, a) /* IDF011 */ -#define T_GPS_SATELLITE_ID(a) ADDBITS( 6, a) /* DF068 */ -#define T_QZSS_SATELLITE_ID(a) ADDBITS( 4, a) /* DF249 */ -#define T_GLONASS_SATELLITE_ID(a) ADDBITS( 5, a) /* DF */ -#define T_GNSS_IOD(a) ADDBITS( 8, a) /* IDF012 */ -#define T_GPS_IODE(a) ADDBITS( 8, a) /* DF071 */ -#define T_GLONASS_IOD(a) ADDBITS( 8, a) /* DF239 */ -#define T_GALILEO_IOD(a) ADDBITS(10, a) /* DF459 */ -#define T_SBAS_T0MOD(a) ADDBITS( 9, (a/16)) /* DF468 */ -#define T_SBAS_IODCRC(a) ADDBITS(24, a) /* DF469 */ -#define T_BDS_TOEMOD(a) ADDBITS(10, (a/8)) /* DF470 */ -#define T_BDS_IOD(a) ADDBITS( 8, a) /* DF471 */ +#define T_GPS_SATELLITE_ID(a) ADDBITS( 6, a) /* IDF011 DF068 DF488 */ +#define T_QZSS_SATELLITE_ID(a) ADDBITS( 4, a) /* DF249 */ +#define T_GLONASS_SATELLITE_ID(a) ADDBITS( 5, a) /* DF384 (old RTCM) */ +#define T_GLONASS_SATELLITE_ID_NEW(a) ADDBITS( 6, a) /* DF (new RTCM) */ +#define T_GPS_IODE(a) ADDBITS( 8, a) /* IDF012 DF071 */ +#define T_GLONASS_IOD(a) ADDBITS( 8, a) /* DF239 */ +#define T_GALILEO_IOD(a) ADDBITS(10, a) /* DF459 */ +#define T_SBAS_T0MOD(a) ADDBITS( 9, (a/16)) /* DF468 */ +#define T_SBAS_IODCRC(a) ADDBITS(24, a) /* DF469 */ +#define T_BDS_TOEMOD(a) ADDBITS(10, (a/8)) /* DF470 */ +#define T_BDS_IOD(a) ADDBITS( 8, a) /* DF471 */ /* Orbit Corrections */ @@ -497,6 +497,5 @@ /* Biases */ -#define T_NO_OF_BIASES(a) ADDBITS(5, a) /* DF, DF IDF023 */ //_NO_OF_CODE_BIASES(a)T_NO_OF_PHASE_BIASES(a) - +#define T_NO_OF_BIASES(a) ADDBITS(5, a) /* DF479 DF379 IDF023 */ #define T_GNSS_SIGNAL_IDENTIFIER(a) ADDBITS(5, a) /* DF380, IDF024 */ #define T_CODE_BIAS(a) SCALEADDBITS(14, 100.0, a) /* DF383, IDF025 */ @@ -506,21 +505,59 @@ /* Phase specific part of GNSS phase bias message */ -#define T_INTEGER_INDICATOR(a) ADDBITS( 1, a) /* DF483, IDF029 */ -#define T_WIDE_LANE_INDICATOR(a) ADDBITS( 2, a) /* DF484, IDF030 */ -#define T_DISCONTINUITY_COUNTER(a) ADDBITS( 4, a) /* DF485, IDF031 */ -#define T_DISPERSIVE_BIAS_INDICATOR(a) ADDBITS( 1, a) /* DF486, IDF032 */ -#define T_MW_CONSISTENCY_INDICATOR(a) ADDBITS( 1, a) /* DF487, IDF033 */ +#define T_INTEGER_INDICATOR(a) ADDBITS(1, a) /* DF483, IDF029 */ +#define T_WIDE_LANE_INDICATOR(a) ADDBITS(2, a) /* DF484, IDF030 */ +#define T_DISCONTINUITY_COUNTER(a) ADDBITS(4, a) /* DF485, IDF031 */ +#define T_DISPERSIVE_BIAS_INDICATOR(a) ADDBITS(1, a) /* DF486 (old RTCM), IDF032 */ +#define T_YAW_INFO_INDICATOR(a) ADDBITS(1, a) /* DF486 (new RTCM) */ +#define T_MW_CONSISTENCY_INDICATOR(a) ADDBITS(1, a) /* DF487 (old RTCM), IDF033 */ +#define T_EXTENDED_PHASE_BIAS_ID(a) ADDBITS(4, a) /* DF+002 (new RTCM) */ /* URA */ -#define T_SSR_URA(a) ADDBITS( 6, a) /* DF389, IDF034 */ +#define T_SSR_URA(a) ADDBITS( 6, a) /* DF389, IDF034 */ + +/* Antenna Information*/ +#define T_SATELLITE_ANTENNA_IOD(a) ADDBITS(6, a) /* DF+010 (new RTCM) */ +#define T_PHASE_CENTER_INFO_INDICATOR(a) ADDBITS(1, a) /* DF+011 (new RTCM) */ +#define T_GROUP_DELAY_INFO_INDICATOR(a) ADDBITS(1, a) /* DF+012 (new RTCM) */ +#define T_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a) ADDBITS(1, a) /* DF+013 (new RTCM) */ +#define T_MAXIMUM_OFF_NADIR_ANGLE(a) ADDBITS(5, a) /* DF+014 (new RTCM) */ +#define T_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) ADDBITS(4, a) /* DF+015 (new RTCM) */ +#define T_SATELLITE_SET_INDICATOR(a) ADDBITS(1, a) /* DF+016 (new RTCM) */ +#define T_FREQUENCY_SET_INDICATOR(a) ADDBITS(1, a) /* DF+017 (new RTCM) */ +#define T_GNSS_FREQUENCY_MASK(a) ADDBITS(6, a) /* DF+018 (new RTCM) */ +#define T_NADIR_CORR_INDICATOR(a) ADDBITS(1, a) /* DF+019 (new RTCM) */ +#define T_NADIR_CORRECTION(a) ADDBITS(12, a) /* DF+020 (new RTCM) */ +#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*/ + +/* Grid Messages */ +#define T_GRID_ID(a) ADDBITS(10, a) /* DF+022 (new RTCM) */ +#define T_GRID_TYPE(a) ADDBITS(3 , a) /* DF+023 (new RTCM) */ +#define T_LATITUDE_OF_REFERENCE_POINT(a) SCALEADDBITS(18, 1000.0, a) /* DF+024 (new RTCM) */ +#define T_LONGITUDE_OF_REFERENCE_POINT(a) SCALEADDBITS(19, 1000.0, a) /* DF+025 (new RTCM) */ +#define T_ELLIPSOIDAL_HEIGHT_OF_REFERENCE_POINT(a) SCALEADDBITS(10, 1/12.5, a+1000.0) /* DF+026 (new RTCM) */ +#define T_NUMNBER_OF_RELATIVE_POINTS(a) ADDBITS(8, a) /* DF+027 (new RTCM) */ +#define T_RELATIVE_LATITUDE(a) SCALEADDBITS(13, 1000.0, a) /* DF+028 (new RTCM) */ +#define T_RELATIVE_LONGITUDE(a) SCALEADDBITS(14, 1000.0, a) /* DF+029 (new RTCM) */ +#define T_RELATIVE_HIGHT(a) SCALEADDBITS(9, 1/12.5, a) /* DF+030 (new RTCM) */ +#define T_NUMBER_OF_ROWS_4_LATITIDE_DIRECTION(a) ADDBITS(6, a) /* DF+031 (new RTCM) */ +#define T_NUMBER_OF_ROWS_4_LONGITUDE_DIRECTION(a) ADDBITS(6, a) /* DF+032 (new RTCM) */ +#define T_GRID_STEP_SIZE_4_LATITIDE_DIRECTION(a) SCALEADDBITS(9, 100.0, a) /* DF+031 (new RTCM) */ +#define T_GRID_STEP_SIZE_4_LONGITUDE_DIRECTION(a) SCALEADDBITS(10, 100.0, a) /* DF+032 (new RTCM) */ + + +#define LATITUDE_OF_REFERENCE_POINT SCALEADDBITS() /* DF+028 (new RTCM) */ +#define LATITUDE_OF_REFERENCE_POINT SCALEADDBITS() /* DF+029 (new RTCM) */ +#define LATITUDE_OF_REFERENCE_POINT SCALEADDBITS() /* DF+030 (new RTCM) */ + /* Ionosphere */ -#define T_NO_IONO_LAYERS(a) ADDBITS( 2, a-1) /* DF472, IDF035 */ +#define T_NO_IONO_LAYERS(a) ADDBITS(2, a-1) /* DF472, IDF035 */ #define T_IONO_HEIGHT(a) SCALEADDBITS( 8, 1/10000.0, a) /* DF473, IDF036 */ -#define T_IONO_DEGREE(a) ADDBITS( 4, a-1) /* DF474, IDF037 */ -#define T_IONO_ORDER(a) ADDBITS( 4, a-1) /* DF475, IDF038 */ +#define T_IONO_DEGREE(a) ADDBITS(4, a-1) /* DF474, IDF037 */ +#define T_IONO_ORDER(a) ADDBITS(4, a-1) /* DF475, IDF038 */ #define T_IONO_COEFF_C(a) SCALEADDBITS(16, 200.0, a) /* DF476, IDF039 */ #define T_IONO_COEFF_S(a) SCALEADDBITS(16, 200.0, a) /* DF477, IDF040 */ #define T_VTEC_QUALITY_INDICATOR(a) SCALEADDBITS( 9, 20.0, a) /* DF478, IDF041 */ + static double URAToValue(int ura) { @@ -548,5 +585,5 @@ #define DECODESTART \ int numbits=0; \ - uint64_t bitbuffer=0; + uint64_t bitbuffer=0; #define LOADSSRBITS(a) { \ @@ -598,12 +635,12 @@ /* GNSS macros - Header part */ -#define G_RTCM_MESSAGE_NUMBER(a) GETSSRBITS(a, 12) /* DF002 */ -#define G_IGS_MESSAGE_NUMBER(a) GETSSRBITS(a, 8) /* IDF002 */ -#define G_IGS_SSR_VERSION(a) GETSSRBITS(a, 3) /* IDF001 */ -#define G_SSR_EPOCH_TIME(a) GETSSRBITS(a, 20) /*DF385 IDF003 */ -#define G_SSR_EPOCH_TIME_CHECK(a, b) {unsigned int temp; GETSSRBITS(temp, 20) \ - if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} -#define G_GLONASS_EPOCH_TIME(a, b) {unsigned int temp; GETSSRBITS(temp, 17) \ - if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} +#define G_RTCM_MESSAGE_NUMBER(a) GETSSRBITS(a,12) /* DF002 */ +#define G_IGS_MESSAGE_NUMBER(a) GETSSRBITS(a, 8) /* IDF002 */ +#define G_IGS_SSR_VERSION(a) GETSSRBITS(a, 3) /* IDF001 */ + +#define G_GPS_EPOCH_TIME(a) GETSSRBITS(a,20) /* IDF003 DF385 DF458 DF460 DF465*/ +#define G_GLONASS_EPOCH_TIME(a) GETSSRBITS(a,17) /* DF386 */ +#define G_GPS_EPOCH_TIME_CHECK(a, b) {unsigned int temp; GETSSRBITS(temp, 20) if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} +#define G_GLONASS_EPOCH_TIME_CHECK(a, b) {unsigned int temp; GETSSRBITS(temp, 17) if(b && a != temp) return GCOBR_TIMEMISMATCH; a = temp;} #define G_SSR_UPDATE_INTERVAL(a) GETSSRBITS(a, 4) /* DF391, IDF004 */ @@ -616,10 +653,12 @@ /* GNSS macros - Satellite specific part */ -#define G_GNSS_SATELLITE_ID(a) GETSSRBITS(a, 6) /* DF068, IDF011 */ -#define G_GLONASS_SATELLITE_ID(a) GETSSRBITS(a, 5) /* DF */ -#define G_QZSS_SATELLITE_ID(a) GETSSRBITS(a, 4) /* DF249 */ - -#define G_GNSS_IOD(a) GETSSRBITS(a, 8) /*DF071, DF237,DF471 IDF012 */ +#define G_GPS_SATELLITE_ID(a) GETSSRBITS(a, 6) /* IDF011 DF068 DF488 */ +#define G_GLONASS_SATELLITE_ID(a) GETSSRBITS(a, 5) /* DF384 */ +#define G_GLONASS_SATELLITE_ID_NEW(a) GETSSRBITS(a, 6) /* DF*/ +#define G_QZSS_SATELLITE_ID(a) GETSSRBITS(a, 4) /* DF249 */ + +#define G_GPS_IODE(a) GETSSRBITS(a, 8) /* DF071, DF467, IDF012 */ #define G_GALILEO_IOD(a) GETSSRBITS(a, 10) /* DF459 */ + #define G_SBAS_T0MOD(a) GETSSRBITSFACTOR(a, 9, 16) /* DF468 */ #define G_SBAS_IODCRC(a) GETSSRBITS(a, 24) /* DF469 */ @@ -641,5 +680,5 @@ /* Biases */ -#define G_NO_OF_BIASES(a) GETSSRBITS(a, 5) /* DF, DF IDF023 */ +#define G_NO_OF_BIASES(a) GETSSRBITS(a, 5) /* DF479 DF379 IDF023 */ #define G_GNSS_SIGNAL_IDENTIFIER(a) GETSSRBITS(a, 5) /* DF IDF024 */ #define G_CODE_BIAS(a) GETSSRFLOATSIGN(a, 14, 1/100.0) /* DF383, IDF025 */ @@ -649,14 +688,30 @@ /* Phase specific part of GNSS phase bias message */ -#define G_INTEGER_INDICATOR(a) GETSSRBITS(a, 1) /* DF483, IDF029 */ -#define G_WIDE_LANE_INDICATOR(a) GETSSRBITS(a, 2) /* DF484, IDF030 */ -#define G_DISCONTINUITY_COUNTER(a) GETSSRBITS(a, 4) /* DF485, IDF031 */ -#define G_DISPERSIVE_BIAS_INDICATOR(a) GETSSRBITS(a, 1) /* DF486, IDF032 */ -#define G_MW_CONSISTENCY_INDICATOR(a) GETSSRBITS(a, 1) /* DF487, IDF033 */ +#define G_INTEGER_INDICATOR(a) GETSSRBITS(a, 1) /* DF483, IDF029 */ +#define G_WIDE_LANE_INDICATOR(a) GETSSRBITS(a, 2) /* DF484, IDF030 */ +#define G_DISCONTINUITY_COUNTER(a) GETSSRBITS(a, 4) /* DF485, IDF031 */ +#define G_DISPERSIVE_BIAS_INDICATOR(a) GETSSRBITS(a, 1) /* DF486 (old RTCM), IDF032 */ +#define G_YAW_INFO_INDICATOR(a) GETSSRBITS(a, 1) /* DF486 (new RTCM) */ +#define G_MW_CONSISTENCY_INDICATOR(a) GETSSRBITS(a, 1) /* DF487, IDF033 */ +#define G_EXTENDED_PHASE_BIAS_ID(a) GETSSRBITS(4, a) /* DF?? (new RTCM)*/ /* URA */ -#define G_SSR_URA(a) {int temp; GETSSRBITS(temp, 6) \ - (a) = URAToValue(temp);} /* DF389, IDF034 */ - +#define G_SSR_URA(a) {int temp; GETSSRBITS(temp, 6) \ + (a) = URAToValue(temp);} /* DF389, IDF034 */ + +/* Antenna Information*/ +#define G_SATELLITE_ANTENNA_IOD(a) GETSSRBITS(a, 6) /* DF+010 (new RTCM) */ +#define G_PHASE_CENTER_INFO_INDICATORD(a) GETSSRBITS(a, 1) /* DF+011 (new RTCM) */ +#define G_GROUP_DELAY_INFO_INDICATOR(a) GETSSRBITS(a, 1) /* DF+012 (new RTCM) */ +#define G_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a) GETSSRBITS(a, 1) /* DF+013 (new RTCM) */ +#define G_MAXIMUM_OFF_NADIR_ANGLE(a) GETSSRBITS(a, 5) /* DF+014 (new RTCM) */ +#define G_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) GETSSRBITS(a, 4) /* DF+015 (new RTCM) */ +#define G_SATELLITE_SET_INDICATOR(a) GETSSRBITS(a, 1) /* DF+016 (new RTCM) */ +#define G_FREQUENCY_SET_INDICATOR (a) GETSSRBITS(a, 1) /* DF+017 (new RTCM) */ +#define G_GNSS_FREQUENCY_MASK (a) GETSSRBITS(a, 6) /* DF+018 (new RTCM) */ +#define G_NADIR_CORR_INDICATOR(a) GETSSRBITS(a, 1) /* DF+019 (new RTCM) */ +#define G_NADIR_CORRECTION(a) GETSSRBITS(a, 12) /* DF+020 (new RTCM) */ +#define G_NADIR_ANGLE_DEPENDENT_CORRECTION(a) GETSSRBITS(a, 3 + G_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a)) /* DF+021 (new RTCM) */ + /* Ionosphere */ #define G_NO_IONO_LAYERS(a) {unsigned int temp; GETSSRBITS(temp, 2) a = temp+1;} /* DF472, IDF035 */ Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp (revision 10986) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp (revision 10987) @@ -70,5 +70,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_ORBIT) - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) T_SSR_UPDATE_INTERVAL(co->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -79,6 +79,6 @@ T_NO_OF_SATELLITES(co->NumberOfSat[s]) for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { - T_GNSS_SATELLITE_ID(co->Sat[i].ID) - T_GNSS_IOD(co->Sat[i].IOD) + T_GPS_SATELLITE_ID(co->Sat[i].ID) + T_GPS_IODE(co->Sat[i].IOD) T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial) T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack) @@ -95,5 +95,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_CLOCK) - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) T_SSR_UPDATE_INTERVAL(co->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -103,5 +103,5 @@ T_NO_OF_SATELLITES(co->NumberOfSat[s]) for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GPS_SATELLITE_ID(co->Sat[i].ID) T_DELTA_CLOCK_C0(co->Sat[i].Clock.DeltaA0) T_DELTA_CLOCK_C1(co->Sat[i].Clock.DeltaA1) @@ -127,5 +127,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_COMBINED) - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) T_SSR_UPDATE_INTERVAL(co->UpdateInterval) #ifdef SPLITBLOCK @@ -145,6 +145,6 @@ for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { #endif - T_GNSS_SATELLITE_ID(co->Sat[i].ID) - T_GNSS_IOD(co->Sat[i].IOD) + T_GPS_SATELLITE_ID(co->Sat[i].ID) + T_GPS_IODE(co->Sat[i].IOD) T_DELTA_RADIAL(co->Sat[i].Orbit.DeltaRadial) T_DELTA_ALONG_TRACK(co->Sat[i].Orbit.DeltaAlongTrack) @@ -170,5 +170,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_HR) - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) T_SSR_UPDATE_INTERVAL(co->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -178,5 +178,5 @@ T_NO_OF_SATELLITES(co->NumberOfSat[s]) for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GPS_SATELLITE_ID(co->Sat[i].ID) T_HR_CLOCK_CORRECTION(co->Sat[i].hrclock) } @@ -188,5 +188,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_URA) - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) T_SSR_UPDATE_INTERVAL(co->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -196,5 +196,5 @@ T_NO_OF_SATELLITES(co->NumberOfSat[s]) for (i = satoffset[s]; i < satoffset[s] + co->NumberOfSat[s]; ++i) { - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GPS_SATELLITE_ID(co->Sat[i].ID) T_SSR_URA(ValueToURA(co->Sat[i].UserRangeAccuracy)) } @@ -217,5 +217,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_CBIAS) - T_SSR_EPOCH_TIME(b->EpochTime[s]) + T_GPS_EPOCH_TIME(b->EpochTime[s]) T_SSR_UPDATE_INTERVAL(b->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -225,5 +225,5 @@ T_NO_OF_SATELLITES(b->NumberOfSat[s]) for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { - T_GNSS_SATELLITE_ID(b->Sat[i].ID) + T_GPS_SATELLITE_ID(b->Sat[i].ID) T_NO_OF_BIASES(b->Sat[i].NumberOfCodeBiases) for (j = 0; j < b->Sat[i].NumberOfCodeBiases; ++j) { @@ -250,5 +250,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(corbase[s] + COBOFS_PBIAS) - T_SSR_EPOCH_TIME(b->EpochTime[s]) + T_GPS_EPOCH_TIME(b->EpochTime[s]) T_SSR_UPDATE_INTERVAL(b->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -260,5 +260,5 @@ T_NO_OF_SATELLITES(b->NumberOfSat[s]) for (i = satoffset[s]; i < satoffset[s] + b->NumberOfSat[s]; ++i) { - T_GNSS_SATELLITE_ID(b->Sat[i].ID) + T_GPS_SATELLITE_ID(b->Sat[i].ID) T_NO_OF_BIASES(b->Sat[i].NumberOfPhaseBiases) T_YAW_ANGLE(b->Sat[i].YawAngle) @@ -287,5 +287,5 @@ T_IGS_SSR_VERSION(IGS_SSR_VERSION) T_IGS_MESSAGE_NUMBER(VTEC_BASE) - T_SSR_EPOCH_TIME(v->EpochTime) + T_GPS_EPOCH_TIME(v->EpochTime) T_SSR_UPDATE_INTERVAL(v->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -361,5 +361,5 @@ return GCOBR_NOVTECPARAMETER; memset(v, 0, sizeof(*v)); - G_SSR_EPOCH_TIME(v->EpochTime) + G_GPS_EPOCH_TIME(v->EpochTime) G_SSR_UPDATE_INTERVAL(v->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -415,5 +415,5 @@ return GCOBR_NOCLOCKORBITPARAMETER; co->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(co->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -430,5 +430,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; @@ -440,5 +440,5 @@ ++co->NumberOfSat[s]; co->Sat[pos].ID = id; - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial) G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack) @@ -461,5 +461,5 @@ return GCOBR_NOCLOCKORBITPARAMETER; co->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(co->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -475,5 +475,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; @@ -499,5 +499,5 @@ return GCOBR_NOCLOCKORBITPARAMETER; co->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(co->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -515,5 +515,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; @@ -525,5 +525,5 @@ ++co->NumberOfSat[s]; co->Sat[pos].ID = id; - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) G_DELTA_RADIAL(co->Sat[pos].Orbit.DeltaRadial) G_DELTA_ALONG_TRACK(co->Sat[pos].Orbit.DeltaAlongTrack) @@ -549,5 +549,5 @@ return GCOBR_NOCLOCKORBITPARAMETER; co->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(co->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -563,5 +563,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; @@ -584,5 +584,5 @@ return GCOBR_NOCLOCKORBITPARAMETER; co->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(co->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -598,5 +598,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + co->NumberOfSat[s] && co->Sat[pos].ID != id; @@ -619,5 +619,5 @@ return GCOBR_NOCODEBIASPARAMETER; b->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(b->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -632,5 +632,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + b->NumberOfSat[s] && b->Sat[pos].ID != id; @@ -664,5 +664,5 @@ return GCOBR_NOPHASEBIASPARAMETER; pb->messageType = igstype; - G_SSR_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) G_SSR_UPDATE_INTERVAL(pb->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -680,5 +680,5 @@ #endif for (i = 0; i < nums; ++i) { - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) for (pos = satoffset[s]; pos < satoffset[s] + pb->NumberOfSat[s] && pb->Sat[pos].ID != id; Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h (revision 10986) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h (revision 10987) @@ -140,8 +140,4 @@ CODETYPE_GPS_L5_Q = 15; - - - - CODETYPE_GLONASS_L1_CA = 0; CODETYPE_GLONASS_L1_P = 1; @@ -154,7 +150,4 @@ CODETYPE_GLONASS_L3_I = 8; CODETYPE_GLONASS_L3_Q = 9; - - - CODETYPE_GALILEO_E1_A = 0; Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (revision 10986) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (revision 10987) @@ -76,5 +76,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -136,5 +136,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -190,5 +190,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -269,5 +269,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -309,5 +309,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -360,5 +360,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(b->EpochTime[s]) + T_GPS_EPOCH_TIME(b->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -415,5 +415,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(b->EpochTime[s]) + T_GPS_EPOCH_TIME(b->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -470,5 +470,5 @@ INITBLOCK T_RTCM_MESSAGE_NUMBER(VTEC_BASE) - T_SSR_EPOCH_TIME(v->EpochTime) + T_GPS_EPOCH_TIME(v->EpochTime) T_SSR_UPDATE_INTERVAL(v->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -538,5 +538,5 @@ return GCOBR_NOVTECPARAMETER; memset(v, 0, sizeof(*v)); - G_SSR_EPOCH_TIME(v->EpochTime) + G_GPS_EPOCH_TIME(v->EpochTime) G_SSR_UPDATE_INTERVAL(v->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -596,8 +596,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(pb->EpochTime[s], pb->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) break; } @@ -622,5 +622,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -688,8 +688,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -713,5 +713,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -735,8 +735,8 @@ case CLOCKORBIT_SATGPS: case CLOCKORBIT_SATQZSS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGLONASS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGALILEO: @@ -749,5 +749,5 @@ case CLOCKORBIT_SATBDS: G_BDS_TOEMOD(co->Sat[pos].toe) - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; } @@ -778,8 +778,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -802,5 +802,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -841,8 +841,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -867,5 +867,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -889,8 +889,8 @@ case CLOCKORBIT_SATGPS: case CLOCKORBIT_SATQZSS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGLONASS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGALILEO: @@ -903,5 +903,5 @@ case CLOCKORBIT_SATBDS: G_BDS_TOEMOD(co->Sat[pos].toe) - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; } @@ -935,8 +935,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -959,5 +959,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -994,8 +994,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -1018,5 +1018,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -1053,8 +1053,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(b->EpochTime[s], b->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) break; } @@ -1076,5 +1076,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 10986) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 10987) @@ -75,5 +75,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -95,5 +95,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GLONASS_SATELLITE_ID(co->Sat[i].ID) T_GLONASS_IOD(co->Sat[i].IOD) break; @@ -135,5 +135,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -159,5 +159,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GLONASS_SATELLITE_ID(co->Sat[i].ID) break; } @@ -189,5 +189,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -219,5 +219,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GLONASS_SATELLITE_ID(co->Sat[i].ID) T_GLONASS_IOD(co->Sat[i].IOD) break; @@ -268,5 +268,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -292,5 +292,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GLONASS_SATELLITE_ID(co->Sat[i].ID) break; } @@ -308,5 +308,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(co->EpochTime[s]) + T_GPS_EPOCH_TIME(co->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -332,5 +332,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(co->Sat[i].ID) + T_GLONASS_SATELLITE_ID(co->Sat[i].ID) break; } @@ -359,5 +359,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(b->EpochTime[s]) + T_GPS_EPOCH_TIME(b->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -383,5 +383,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(b->Sat[i].ID) + T_GLONASS_SATELLITE_ID(b->Sat[i].ID) break; } @@ -414,5 +414,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - T_SSR_EPOCH_TIME(b->EpochTime[s]) + T_GPS_EPOCH_TIME(b->EpochTime[s]) break; case CLOCKORBIT_SATGLONASS: @@ -440,5 +440,5 @@ break; case CLOCKORBIT_SATGLONASS: - T_GNSS_SATELLITE_ID(b->Sat[i].ID) + T_GLONASS_SATELLITE_ID(b->Sat[i].ID) break; } @@ -469,5 +469,5 @@ INITBLOCK T_RTCM_MESSAGE_NUMBER(VTEC_BASE) - T_SSR_EPOCH_TIME(v->EpochTime) + T_GPS_EPOCH_TIME(v->EpochTime) T_SSR_UPDATE_INTERVAL(v->UpdateInterval) T_MULTIPLE_MESSAGE_INDICATOR(moremessagesfollow ? 1 : 0) @@ -537,5 +537,5 @@ return GCOBR_NOVTECPARAMETER; memset(v, 0, sizeof(*v)); - G_SSR_EPOCH_TIME(v->EpochTime) + G_GPS_EPOCH_TIME(v->EpochTime) G_SSR_UPDATE_INTERVAL(v->UpdateInterval) G_MULTIPLE_MESSAGE_INDICATOR(mmi) @@ -595,8 +595,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(pb->EpochTime[s], pb->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(pb->EpochTime[s], pb->NumberOfSat[s]) break; } @@ -621,5 +621,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -627,5 +627,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } @@ -687,8 +687,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -712,5 +712,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -718,5 +718,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } @@ -734,8 +734,8 @@ case CLOCKORBIT_SATGPS: case CLOCKORBIT_SATQZSS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGLONASS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGALILEO: @@ -748,5 +748,5 @@ case CLOCKORBIT_SATBDS: G_BDS_TOEMOD(co->Sat[pos].toe) - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; } @@ -777,8 +777,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -801,5 +801,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -807,5 +807,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } @@ -840,8 +840,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -866,5 +866,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -872,5 +872,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } @@ -888,8 +888,8 @@ case CLOCKORBIT_SATGPS: case CLOCKORBIT_SATQZSS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGLONASS: - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; case CLOCKORBIT_SATGALILEO: @@ -902,5 +902,5 @@ case CLOCKORBIT_SATBDS: G_BDS_TOEMOD(co->Sat[pos].toe) - G_GNSS_IOD(co->Sat[pos].IOD) + G_GPS_IODE(co->Sat[pos].IOD) break; } @@ -934,8 +934,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -958,5 +958,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -964,5 +964,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } @@ -993,8 +993,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(co->EpochTime[s], co->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(co->EpochTime[s], co->NumberOfSat[s]) break; } @@ -1017,5 +1017,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -1023,5 +1023,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } @@ -1052,8 +1052,8 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_SSR_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) + G_GPS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) break; case CLOCKORBIT_SATGLONASS: - G_GLONASS_EPOCH_TIME(b->EpochTime[s], b->NumberOfSat[s]) + G_GLONASS_EPOCH_TIME_CHECK(b->EpochTime[s], b->NumberOfSat[s]) break; } @@ -1075,5 +1075,5 @@ case CLOCKORBIT_SATSBAS: case CLOCKORBIT_SATBDS: - G_GNSS_SATELLITE_ID(id) + G_GPS_SATELLITE_ID(id) break; case CLOCKORBIT_SATQZSS: @@ -1081,5 +1081,5 @@ break; case CLOCKORBIT_SATGLONASS: - G_GNSS_SATELLITE_ID(id) + G_GLONASS_SATELLITE_ID(id) break; } Index: /trunk/BNC/src/bncversion.h =================================================================== --- /trunk/BNC/src/bncversion.h (revision 10986) +++ /trunk/BNC/src/bncversion.h (revision 10987) @@ -3,5 +3,5 @@ #define BNCVERSION_H -#define BNCVERSION "2.13.7" +#define BNCVERSION "2.13.8" #define BNCPGMNAME "BNC " BNCVERSION