From 1536ab7be0b8645d98bd21621090bf72b6e95864 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 8 May 2015 16:06:30 +0200 Subject: [PATCH] More fixes to make old and new configuration notations compatible --- conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf | 33 +++++----- conf/gnss-sdr_Galileo_E5a.conf | 66 +++++++++---------- conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf | 66 +++++++++---------- conf/gnss-sdr_Hybrid_byte.conf | 3 - conf/gnss-sdr_Hybrid_nsr.conf | 5 +- conf/gnss-sdr_Hybrid_short.conf | 9 +-- src/core/receiver/gnss_flowgraph.cc | 4 +- .../gps_l2_m_pcps_acquisition_test.cc | 2 +- 8 files changed, 90 insertions(+), 98 deletions(-) diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf index a8435b7f8..a42681db2 100644 --- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf @@ -44,7 +44,7 @@ SignalSource.sampling_frequency=4000000 SignalSource.freq=1575420000 ;#gain: Front-end Gain in [dB] -SignalSource.gain=40 +SignalSource.gain=50 ;#subdevice: UHD subdevice specification (for USRP1 use A:0 or B:0) SignalSource.subdevice=A:0 @@ -180,7 +180,7 @@ Resampler.sample_freq_out=4000000 ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available GPS satellite channels. -Channels_GPS.count=8 +Channels_GPS.count=12 ;#count: Number of available Galileo satellite channels. Channels_Galileo.count=0 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver @@ -253,17 +253,17 @@ Channel.signal=1C ;######### CHANNEL 0 CONFIG ############ -Channel0.system=GPS -Channel0.signal=1C +;Channel0.system=GPS +;Channel0.signal=1C ;#satellite: Satellite PRN ID for this channel. Disable this option to random search -Channel0.satellite=11 +;Channel0.satellite=11 ;######### CHANNEL 1 CONFIG ############ -Channel1.system=GPS -Channel1.signal=1C -Channel1.satellite=18 +;Channel1.system=GPS +;Channel1.signal=1C +;Channel1.satellite=18 ;######### ACQUISITION GLOBAL CONFIG ############ @@ -280,16 +280,16 @@ Acquisition_GPS.if=0 Acquisition_GPS.coherent_integration_time_ms=1 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] Acquisition_GPS.implementation=GPS_L1_CA_PCPS_Acquisition +;Acquisition_GPS.implementation=GPS_L1_CA_PCPS_Tong_Acquisition ;#threshold: Acquisition threshold. It will be ignored if pfa is defined. -Acquisition_GPS.threshold=0.02 +Acquisition_GPS.threshold=0.01 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -;Acquisition_GPS.pfa=0.0001 +;Acquisition_GPS.pfa=0.00001 ;#doppler_max: Maximum expected Doppler shift [Hz] -Acquisition_GPS.doppler_max=8000 +Acquisition_GPS.doppler_max=6000 ;#doppler_max: Doppler step in the grid search [Hz] Acquisition_GPS.doppler_step=500 -;#bit_transition_flag: Enable or disable a strategy to deal with bit transitions in GPS signals: process two dwells and take -maximum test statistics. Only use with implementation: [GPS_L1_CA_PCPS_Acquisition] (should not be used for Galileo_E1_PCPS_Ambiguous_Acquisition]) +;#bit_transition_flag: Enable or disable a strategy to deal with bit transitions in GPS signals: process two dwells and take maximum test statistics. Only use with implementation: [GPS_L1_CA_PCPS_Acquisition] (should not be used for Galileo_E1_PCPS_Ambiguous_Acquisition]) Acquisition_GPS.bit_transition_flag=false ;#max_dwells: Maximum number of consecutive dwells to be processed. It will be ignored if bit_transition_flag=true Acquisition_GPS.max_dwells=1 @@ -302,7 +302,8 @@ Acquisition_GPS.max_dwells=1 ;######### TRACKING GLOBAL CONFIG ############ ;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] -Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Optim_Tracking +;Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Optim_Tracking +Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version. Tracking_GPS.item_type=gr_complex @@ -316,10 +317,10 @@ Tracking_GPS.dump=false Tracking_GPS.dump_filename=./tracking_ch_ ;#pll_bw_hz: PLL loop filter bandwidth [Hz] -Tracking_GPS.pll_bw_hz=50.0; +Tracking_GPS.pll_bw_hz=40.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] -Tracking_GPS.dll_bw_hz=2.0; +Tracking_GPS.dll_bw_hz=4.0; ;#fll_bw_hz: FLL loop filter bandwidth [Hz] Tracking_GPS.fll_bw_hz=10.0; diff --git a/conf/gnss-sdr_Galileo_E5a.conf b/conf/gnss-sdr_Galileo_E5a.conf index abdd03f65..83849aa5d 100644 --- a/conf/gnss-sdr_Galileo_E5a.conf +++ b/conf/gnss-sdr_Galileo_E5a.conf @@ -182,12 +182,12 @@ Resampler.sample_freq_out=4000000 ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available satellite channels. -Channels_Galileo.count=1 +Channels_5X.count=1 ;#in_acquisition: Number of channels simultaneously acquiring Channels.in_acquisition=1 ;#system: GPS, GLONASS, Galileo, SBAS or Compass ;#if the option is disabled by default is assigned GPS -Channel.system=Galileo + ;#signal: ;# "1C" GPS L1 C/A @@ -253,7 +253,7 @@ Channel.signal=5X ;######### CHANNEL 0 CONFIG ############ -Channel0.system=Galileo +;Channel0.system=Galileo Channel0.signal=5X ;#satellite: Satellite PRN ID for this channel. Disable this option to random search @@ -281,84 +281,84 @@ Channel0.satellite=19 ;######### ACQUISITION GLOBAL CONFIG ############ ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] -Acquisition_Galileo.dump=true +Acquisition_5X.dump=true ;#filename: Log path and filename -Acquisition_Galileo.dump_filename=./acq_dump.dat +Acquisition_5X.dump_filename=./acq_dump.dat ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. -Acquisition_Galileo.item_type=gr_complex +Acquisition_5X.item_type=gr_complex ;#if: Signal intermediate frequency in [Hz] -Acquisition_Galileo.if=0 +Acquisition_5X.if=0 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms] -Acquisition_Galileo.coherent_integration_time_ms=1 +Acquisition_5X.coherent_integration_time_ms=1 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -Acquisition_Galileo.implementation=Galileo_E5a_Noncoherent_IQ_Acquisition_CAF +Acquisition_5X.implementation=Galileo_E5a_Noncoherent_IQ_Acquisition_CAF ;#threshold: Acquisition threshold. It will be ignored if pfa is defined. -Acquisition_Galileo.threshold=0.001 +Acquisition_5X.threshold=0.001 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -Acquisition_Galileo.pfa=0.0003 +Acquisition_5X.pfa=0.0003 ;#doppler_max: Maximum expected Doppler shift [Hz] -Acquisition_Galileo.doppler_max=10000 +Acquisition_5X.doppler_max=10000 ;#doppler_max: Doppler step in the grid search [Hz] -Acquisition_Galileo.doppler_step=250 +Acquisition_5X.doppler_step=250 ;#bit_transition_flag: Enable or disable a strategy to deal with bit transitions in GPS signals: process two dwells and take ;maximum test statistics. Only use with implementation: [GPS_L1_CA_PCPS_Acquisition] (should not be used for Galileo_E1_PCPS_Ambiguous_Acquisition]) -Acquisition_Galileo.bit_transition_flag=false +Acquisition_5X.bit_transition_flag=false ;#max_dwells: Maximum number of consecutive dwells to be processed. It will be ignored if bit_transition_flag=true -Acquisition_Galileo.max_dwells=1 +Acquisition_5X.max_dwells=1 ;#CAF filter: **Only for E5a** Resolves doppler ambiguity averaging the specified BW in the winner code delay. If set to 0 CAF filter is desactivated. Recommended value 3000 Hz -Acquisition_Galileo.CAF_window_hz=0 +Acquisition_5X.CAF_window_hz=0 ;#Zero_padding: **Only for E5a** Avoids power loss and doppler ambiguity in bit transitions by correlating one code with twice the input data length, ensuring that at least one full code is present without transitions. ;#If set to 1 it is ON, if set to 0 it is OFF. -Acquisition_Galileo.Zero_padding=0 +Acquisition_5X.Zero_padding=0 ;######### TRACKING GLOBAL CONFIG ############ ;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] -Tracking_Galileo.implementation=Galileo_E5a_DLL_PLL_Tracking +Tracking_5X.implementation=Galileo_E5a_DLL_PLL_Tracking ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version. -Tracking_Galileo.item_type=gr_complex +Tracking_5X.item_type=gr_complex ;#sampling_frequency: Signal Intermediate Frequency in [Hz] -Tracking_Galileo.if=0 +Tracking_5X.if=0 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] -Tracking_Galileo.dump=true +Tracking_5X.dump=true ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number. -Tracking_Galileo.dump_filename=./tracking_ch_ +Tracking_5X.dump_filename=./tracking_ch_ ;#pll_bw_hz_init: **Only for E5a** PLL loop filter bandwidth during initialization [Hz] -Tracking_Galileo.pll_bw_hz_init=20.0; +Tracking_5X.pll_bw_hz_init=20.0; ;#dll_bw_hz_init: **Only for E5a** DLL loop filter bandwidth during initialization [Hz] -Tracking_Galileo.dll_bw_hz_init=20.0; +Tracking_5X.dll_bw_hz_init=20.0; ;#dll_ti_ms: **Only for E5a** loop filter integration time after initialization (secondary code delay search)[ms] -;Tracking_Galileo.ti_ms=3; -Tracking_Galileo.ti_ms=1; +;Tracking_5X.ti_ms=3; +Tracking_5X.ti_ms=1; ;#pll_bw_hz: PLL loop filter bandwidth [Hz] ;Tracking.pll_bw_hz=5.0; -Tracking_Galileo.pll_bw_hz=20.0; +Tracking_5X.pll_bw_hz=20.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] ;Tracking.dll_bw_hz=2.0; -Tracking_Galileo.dll_bw_hz=20.0; +Tracking_5X.dll_bw_hz=20.0; ;#fll_bw_hz: FLL loop filter bandwidth [Hz] -;Tracking_Galileo.fll_bw_hz=10.0; +;Tracking_5X.fll_bw_hz=10.0; ;#order: PLL/DLL loop filter order [2] or [3] -Tracking_Galileo.order=2; +Tracking_5X.order=2; ;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] -Tracking_Galileo.early_late_space_chips=0.5; +Tracking_5X.early_late_space_chips=0.5; ;######### TELEMETRY DECODER CONFIG ############ ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A. -TelemetryDecoder_Galileo.implementation=Galileo_E5a_Telemetry_Decoder -TelemetryDecoder_Galileo.dump=false +TelemetryDecoder_5X.implementation=Galileo_E5a_Telemetry_Decoder +TelemetryDecoder_5X.dump=false ;######### OBSERVABLES CONFIG ############ ;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A. diff --git a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf index 510156d27..f95b35f63 100644 --- a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf +++ b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf @@ -33,7 +33,7 @@ SignalSource.implementation=File_Signal_Source ;SignalSource.filename=/home/marc/E5a_acquisitions/galileo_E5_8M_r2_upsampled_12.dat ;SignalSource.filename=/home/marc/E5a_acquisitions/Tiered_sim_4sat_stup4_2s_up.dat ;SignalSource.filename=/home/marc/E5a_acquisitions/signal_source_sec21M_long.dat -SignalSource.filename=/datalogger/captures/Galileo_E5ab_IFEN_CTTC_run1.dat +SignalSource.filename=/home/gnss/captures/Galileo_E5ab_IFEN_CTTC_run1.dat @@ -183,12 +183,12 @@ Resampler.sample_freq_out=4000000 ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available satellite channels. -Channels_Galileo.count=1 +Channels_5X.count=1 ;#in_acquisition: Number of channels simultaneously acquiring Channels.in_acquisition=1 ;#system: GPS, GLONASS, Galileo, SBAS or Compass ;#if the option is disabled by default is assigned GPS -Channel.system=Galileo +;Channel.system=Galileo ;#signal: ;# "1C" GPS L1 C/A @@ -282,84 +282,84 @@ Channel0.satellite=19 ;######### ACQUISITION GLOBAL CONFIG ############ ;#dump: Enable or disable the acquisition internal data file logging [true] or [false] -Acquisition_Galileo.dump=false +Acquisition_5X.dump=false ;#filename: Log path and filename -Acquisition_Galileo.dump_filename=./acq_dump.dat +Acquisition_5X.dump_filename=./acq_dump.dat ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. -Acquisition_Galileo.item_type=gr_complex +Acquisition_5X.item_type=gr_complex ;#if: Signal intermediate frequency in [Hz] -Acquisition_Galileo.if=0 +Acquisition_5X.if=0 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms] -Acquisition_Galileo.coherent_integration_time_ms=1 +Acquisition_5X.coherent_integration_time_ms=1 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -Acquisition_Galileo.implementation=Galileo_E5a_Noncoherent_IQ_Acquisition_CAF +Acquisition_5X.implementation=Galileo_E5a_Noncoherent_IQ_Acquisition_CAF ;#threshold: Acquisition threshold. It will be ignored if pfa is defined. -Acquisition_Galileo.threshold=0.002 +Acquisition_5X.threshold=0.002 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] -;Acquisition_Galileo.pfa=0.0003 +;Acquisition_5X.pfa=0.0003 ;#doppler_max: Maximum expected Doppler shift [Hz] -Acquisition_Galileo.doppler_max=10000 +Acquisition_5X.doppler_max=10000 ;#doppler_max: Doppler step in the grid search [Hz] -Acquisition_Galileo.doppler_step=250 +Acquisition_5X.doppler_step=250 ;#bit_transition_flag: Enable or disable a strategy to deal with bit transitions in GPS signals: process two dwells and take ;maximum test statistics. Only use with implementation: [GPS_L1_CA_PCPS_Acquisition] (should not be used for Galileo_E1_PCPS_Ambiguous_Acquisition]) -Acquisition_Galileo.bit_transition_flag=false +Acquisition_5X.bit_transition_flag=false ;#max_dwells: Maximum number of consecutive dwells to be processed. It will be ignored if bit_transition_flag=true -Acquisition_Galileo.max_dwells=1 +Acquisition_5X.max_dwells=1 ;#CAF filter: **Only for E5a** Resolves doppler ambiguity averaging the specified BW in the winner code delay. If set to 0 CAF filter is desactivated. Recommended value 3000 Hz -Acquisition_Galileo.CAF_window_hz=0 +Acquisition_5X.CAF_window_hz=0 ;#Zero_padding: **Only for E5a** Avoids power loss and doppler ambiguity in bit transitions by correlating one code with twice the input data length, ensuring that at least one full code is present without transitions. ;#If set to 1 it is ON, if set to 0 it is OFF. -Acquisition_Galileo.Zero_padding=0 +Acquisition_5X.Zero_padding=0 ;######### TRACKING GLOBAL CONFIG ############ ;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] -Tracking_Galileo.implementation=Galileo_E5a_DLL_PLL_Tracking +Tracking_5X.implementation=Galileo_E5a_DLL_PLL_Tracking ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version. -Tracking_Galileo.item_type=gr_complex +Tracking_5X.item_type=gr_complex ;#sampling_frequency: Signal Intermediate Frequency in [Hz] -Tracking_Galileo.if=0 +Tracking_5X.if=0 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] -Tracking_Galileo.dump=true +Tracking_5X.dump=true ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number. -Tracking_Galileo.dump_filename=./tracking_ch_ +Tracking_5X.dump_filename=./tracking_ch_ ;#pll_bw_hz_init: **Only for E5a** PLL loop filter bandwidth during initialization [Hz] -Tracking_Galileo.pll_bw_hz_init=20.0; +Tracking_5X.pll_bw_hz_init=20.0; ;#dll_bw_hz_init: **Only for E5a** DLL loop filter bandwidth during initialization [Hz] -Tracking_Galileo.dll_bw_hz_init=20.0; +Tracking_5X.dll_bw_hz_init=20.0; ;#dll_ti_ms: **Only for E5a** loop filter integration time after initialization (secondary code delay search)[ms] -;Tracking_Galileo.ti_ms=3; -Tracking_Galileo.ti_ms=1; +;Tracking_5X.ti_ms=3; +Tracking_5X.ti_ms=1; ;#pll_bw_hz: PLL loop filter bandwidth [Hz] ;Tracking.pll_bw_hz=5.0; -Tracking_Galileo.pll_bw_hz=20.0; +Tracking_5X.pll_bw_hz=20.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] ;Tracking.dll_bw_hz=2.0; -Tracking_Galileo.dll_bw_hz=20.0; +Tracking_5X.dll_bw_hz=20.0; ;#fll_bw_hz: FLL loop filter bandwidth [Hz] -;Tracking_Galileo.fll_bw_hz=10.0; +;Tracking_5X.fll_bw_hz=10.0; ;#order: PLL/DLL loop filter order [2] or [3] -Tracking_Galileo.order=2; +Tracking_5X.order=2; ;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] -Tracking_Galileo.early_late_space_chips=0.5; +Tracking_5X.early_late_space_chips=0.5; ;######### TELEMETRY DECODER CONFIG ############ ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A. -TelemetryDecoder_Galileo.implementation=Galileo_E5a_Telemetry_Decoder -TelemetryDecoder_Galileo.dump=false +TelemetryDecoder_5X.implementation=Galileo_E5a_Telemetry_Decoder +TelemetryDecoder_5X.dump=false ;######### OBSERVABLES CONFIG ############ ;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A. diff --git a/conf/gnss-sdr_Hybrid_byte.conf b/conf/gnss-sdr_Hybrid_byte.conf index 900a7d303..38e37a8c9 100644 --- a/conf/gnss-sdr_Hybrid_byte.conf +++ b/conf/gnss-sdr_Hybrid_byte.conf @@ -169,9 +169,6 @@ Channels_GPS.count=8 Channels_Galileo.count=8 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver Channels.in_acquisition=1 -;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS -;#if the option is disabled by default is assigned GPS -Channel.system=GPS, Galileo ;#signal: ;#if the option is disabled by default is assigned "1C" GPS L1 C/A diff --git a/conf/gnss-sdr_Hybrid_nsr.conf b/conf/gnss-sdr_Hybrid_nsr.conf index 0de740f66..72c63ac98 100644 --- a/conf/gnss-sdr_Hybrid_nsr.conf +++ b/conf/gnss-sdr_Hybrid_nsr.conf @@ -156,9 +156,6 @@ Channels_GPS.count=8 Channels_Galileo.count=8 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver Channels.in_acquisition=1 -;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS -;#if the option is disabled by default is assigned GPS -Channel.system=GPS, Galileo ;#signal: ;#if the option is disabled by default is assigned "1C" GPS L1 C/A @@ -340,4 +337,4 @@ PVT.dump_filename=./PVT ;# Receiver output filter: Leave this block disabled in this version OutputFilter.implementation=Null_Sink_Output_Filter OutputFilter.filename=data/gnss-sdr.dat -OutputFilter.item_type=gr_complex \ No newline at end of file +OutputFilter.item_type=gr_complex diff --git a/conf/gnss-sdr_Hybrid_short.conf b/conf/gnss-sdr_Hybrid_short.conf index 4eded4424..2d1f7dea1 100644 --- a/conf/gnss-sdr_Hybrid_short.conf +++ b/conf/gnss-sdr_Hybrid_short.conf @@ -17,7 +17,7 @@ ControlThread.wait_for_flowgraph=false SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed -SignalSource.filename=../../../Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat +SignalSource.filename=/home/gnss/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=short @@ -164,14 +164,11 @@ Resampler.sample_freq_out=4000000 ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available GPS satellite channels. -Channels_GPS.count=4 +Channels_GPS.count=3 ;#count: Number of available Galileo satellite channels. -Channels_Galileo.count=4 +Channels_Galileo.count=3 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver Channels.in_acquisition=1 -;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS -;#if the option is disabled by default is assigned GPS -Channel.system=GPS, Galileo ;#signal: ;#if the option is disabled by default is assigned "1C" GPS L1 C/A diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index d2f02244d..34945195c 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -584,7 +584,7 @@ void GNSSFlowgraph::set_signals_list() 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 }; - if ((configuration_->property("Channels_1C.count", 0) > 0) or (default_system.find(std::string("GPS")) != std::string::npos) or (default_signal.compare("1C") == 0) ) + if ((configuration_->property("Channels_1C.count", 0) > 0) or (default_system.find(std::string("GPS")) != std::string::npos) or (default_signal.compare("1C") == 0) or (configuration_->property("Channels_GPS.count", 0) > 0) ) { /* * Loop to create GPS L1 C/A signals @@ -633,7 +633,7 @@ void GNSSFlowgraph::set_signals_list() 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36}; - if ((configuration_->property("Channels_1B.count", 0) > 0) or (default_system.find(std::string("Galileo")) != std::string::npos) or (default_signal.compare("1B") == 0)) + if ((configuration_->property("Channels_1B.count", 0) > 0) or (default_system.find(std::string("Galileo")) != std::string::npos) or (default_signal.compare("1B") == 0) or (configuration_->property("Channels_Galileo.count", 0) > 0)) { /* * Loop to create the list of Galileo E1 B signals diff --git a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc index 3f6a272f6..c3daac5d9 100644 --- a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc @@ -186,7 +186,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) queue = gr::msg_queue::make(0); - double expected_delay_samples = 1;//2004; + double expected_delay_samples = 99991;//2004; double expected_doppler_hz = 1200;//3000; init(); start_queue();