Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 8967) +++ trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 8969) @@ -687,6 +687,5 @@ case CODETYPEGPS_L1_P: return "1P"; case CODETYPEGPS_L1_Z: return "1W"; - //case CODETYPEGPS_L1_Y: return "1Y"; - //case CODETYPEGPS_L1_M: return "1M"; + case CODETYPEGPS_SEMI_CODELESS: return "2D"; case CODETYPEGPS_L2_CA: return "2C"; @@ -696,16 +695,18 @@ case CODETYPEGPS_L2C_M: return "2S"; case CODETYPEGPS_L2C_L: return "2L"; +#ifdef USE_SSR_RTCM case CODETYPEGPS_L2C_ML: return "2X"; - - //case CODETYPEGPS_L2_Y: return "2Y"; - //case CODETYPEGPS_L2_M: return "2M"; +#endif case CODETYPEGPS_L5_I: return "5I"; case CODETYPEGPS_L5_Q: return "5Q"; +#ifdef USE_SSR_RTCM case CODETYPEGPS_L5_IQ: return "5X"; - +#endif case CODETYPEGPS_L1C_D: return "1S"; case CODETYPEGPS_L1C_P: return "1L"; +#ifdef USE_SSR_RTCM case CODETYPEGPS_L1C_DP: return "1X"; +#endif default: return ""; } @@ -719,11 +720,17 @@ case CODETYPEGLONASS_L1a_OCd: return "4A"; case CODETYPEGLONASS_L1a_OCp: return "4B"; +#ifdef USE_SSR_RTCM case CODETYPEGLONASS_L1a_OCdp: return "4X"; +#endif case CODETYPEGLONASS_L2a_CSI: return "6A"; case CODETYPEGLONASS_L2a_OCp: return "6B"; +#ifdef USE_SSR_RTCM case CODETYPEGLONASS_L2a_CSIOCp:return "6X"; +#endif case CODETYPEGLONASS_L3_I: return "3I"; case CODETYPEGLONASS_L3_Q: return "3Q"; +#ifdef USE_SSR_RTCM case CODETYPEGLONASS_L3_IQ: return "3X"; +#endif default: return ""; } @@ -734,13 +741,16 @@ case CODETYPEGALILEO_E1_B: return "1B"; case CODETYPEGALILEO_E1_C: return "1C"; +#ifdef USE_SSR_RTCM case CODETYPEGALILEO_E1_BC: return "1X"; case CODETYPEGALILEO_E1_ABC: return "1Z"; - +#endif case CODETYPEGALILEO_E5A_I: return "5I"; case CODETYPEGALILEO_E5A_Q: return "5Q"; +#ifdef USE_SSR_RTCM case CODETYPEGALILEO_E5A_IQ: return "5X"; - +#endif case CODETYPEGALILEO_E5B_I: return "7I"; case CODETYPEGALILEO_E5B_Q: return "7Q"; +#ifdef USE_SSR_RTCM case CODETYPEGALILEO_E5B_IQ: return "7X"; @@ -748,10 +758,12 @@ case CODETYPEGALILEO_E5_Q: return "8Q"; case CODETYPEGALILEO_E5_IQ: return "8X"; - +#endif case CODETYPEGALILEO_E6_A: return "6A"; case CODETYPEGALILEO_E6_B: return "6B"; case CODETYPEGALILEO_E6_C: return "6C"; +#ifdef USE_SSR_RTCM case CODETYPEGALILEO_E6_BC: return "6X"; case CODETYPEGALILEO_E6_ABC: return "6Z"; +#endif default: return ""; } @@ -765,12 +777,15 @@ case CODETYPEQZSS_L2C_M: return "2S"; case CODETYPEQZSS_L2C_L: return "2L"; +#ifdef USE_SSR_RTCM case CODETYPEQZSS_L2C_ML: return "2X"; - +#endif case CODETYPEQZSS_L5_I: return "5I"; case CODETYPEQZSS_L5_Q: return "5Q"; +#ifdef USE_SSR_RTCM case CODETYPEQZSS_L5_IQ: return "5X"; - +#endif case CODETYPEQZSS_L6_D: return "6S"; case CODETYPEQZSS_L6_P: return "6L"; +#ifdef USE_SSR_RTCM case CODETYPEQZSS_L6_DP: return "6X"; @@ -781,41 +796,57 @@ case CODETYPEQZSS_L5_P: return "5P"; case CODETYPEQZSS_L5_DP: return "5Z"; +#endif case CODETYPEQZSS_L6_E: return "6E"; +#ifdef USE_SSR_RTCM case CODETYPEQZSS_L6_DE: return "6Z"; +#endif default: return ""; } } - else if (system == 'S') { - switch (type) { - case CODETYPE_SBAS_L1_CA: return "1C"; - - case CODETYPE_SBAS_L5_I: return "5I"; - case CODETYPE_SBAS_L5_Q: return "5Q"; - case CODETYPE_SBAS_L5_IQ: return "5X"; - default: return ""; - } - } + else if (system == 'C') { switch (type) { case CODETYPE_BDS_B1_I: return "2I"; case CODETYPE_BDS_B1_Q: return "2Q"; +#ifdef USE_SSR_RTCM case CODETYPE_BDS_B1_IQ: return "2X"; - +#endif case CODETYPE_BDS_B3_I: return "6I"; case CODETYPE_BDS_B3_Q: return "6Q"; +#ifdef USE_SSR_RTCM case CODETYPE_BDS_B3_IQ: return "6X"; - +#endif case CODETYPE_BDS_B2_I: return "7I"; case CODETYPE_BDS_B2_Q: return "7Q"; +#ifdef USE_SSR_RTCM case CODETYPE_BDS_B2_IQ: return "7X"; - +#endif case CODETYPE_BDS_B1a_D: return "1D"; case CODETYPE_BDS_B1a_P: return "1P"; +#ifdef USE_SSR_RTCM case CODETYPE_BDS_B1a_DP: return "1X"; - +#endif case CODETYPE_BDS_B2a_D: return "5D"; case CODETYPE_BDS_B2a_P: return "5P"; +#ifdef USE_SSR_RTCM case CODETYPE_BDS_B2a_DP: return "5X"; +#elif USE_SSR_IGS + case CODETYPE_BDS_B1_A: return "1A"; + case CODETYPE_BDS_B3_A: return "6A"; +#endif + default: return ""; + } + } + + else if (system == 'S') { + switch (type) { + case CODETYPE_SBAS_L1_CA: return "1C"; + + case CODETYPE_SBAS_L5_I: return "5I"; + case CODETYPE_SBAS_L5_Q: return "5Q"; +#ifdef USE_SSR_RTCM + case CODETYPE_SBAS_L5_IQ: return "5X"; +#endif default: return ""; } Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.h =================================================================== --- trunk/BNC/src/RTCM3/RTCM3coDecoder.h (revision 8967) +++ trunk/BNC/src/RTCM3/RTCM3coDecoder.h (revision 8969) @@ -35,5 +35,9 @@ extern "C" { -# include "clock_orbit_rtcm.h" +#ifdef USE_SSR_RTCM +#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm.h" +#elif USE_SSR_IGS +#include "../RTCM3/clock_and_orbit/clock_orbit_igs.h" +#endif } Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c (revision 8967) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.c (revision 8969) @@ -5,5 +5,5 @@ Version: $Id$ Authors: Dirk Stöcker - Description: state space approach for RTCM3 + Description: state space approach: RTCM */ Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h (revision 8967) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h (revision 8969) @@ -8,5 +8,5 @@ Version: $Id$ Authors: Dirk Stöcker - Description: state space approach for RTCM3 + Description: state space approach: RTCM */ @@ -218,9 +218,4 @@ CODETYPEQZSS_L6_DE = 18, - CODETYPE_SBAS_L1_CA = 0, - CODETYPE_SBAS_L5_I = 1, - CODETYPE_SBAS_L5_Q = 2, - CODETYPE_SBAS_L5_IQ = 3, - CODETYPE_BDS_B1_I = 0, CODETYPE_BDS_B1_Q = 1, @@ -239,6 +234,9 @@ CODETYPE_BDS_B2a_DP = 14, - CODETYPE_IRNSS_S_SPS = 8, - CODETYPE_IRNSS_L5_SPS = 22 + CODETYPE_SBAS_L1_CA = 0, + CODETYPE_SBAS_L5_I = 1, + CODETYPE_SBAS_L5_Q = 2, + CODETYPE_SBAS_L5_IQ = 3 + };