diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index b8517858e..3e70d5040 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -177,7 +177,7 @@ Resampler.sample_freq_out=4000000 ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available satellite channels. -Channels.count=1 +Channels.count=6 ;#in_acquisition: Number of channels simultaneously acquiring Channels.in_acquisition=1 ;#system: GPS, GLONASS, Galileo, SBAS or Compass @@ -277,8 +277,6 @@ Acquisition.sampled_ms=1 Acquisition.implementation=GPS_L1_CA_PCPS_Acquisition ;#threshold: Acquisition threshold Acquisition.threshold=0.005 -;#doppler_max: Maximum expected Doppler shift [Hz] -Acquisition.doppler_max=7500 ;#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.pfa=0.0001 ;#doppler_max: Maximum expected Doppler shift [Hz] diff --git a/conf/gnss-sdr_gn3s_realtime.conf b/conf/gnss-sdr_gn3s_realtime.conf index 07cfa8fe6..607f87763 100644 --- a/conf/gnss-sdr_gn3s_realtime.conf +++ b/conf/gnss-sdr_gn3s_realtime.conf @@ -7,7 +7,13 @@ ;######### GLOBAL OPTIONS ################## ;internal_fs_hz: Internal signal sampling frequency after the signal conditioning stage [Hz]. -GNSS-SDR.internal_fs_hz=2727933.33 +; The sampling frequency of GN3S is 8183800 Hz, you can downsample by a natural number using te Signal Conditioner +; 8183800/5 = 1636760 +; 8183800/4 = 2045950 +; 8183800/3 = 2727933.33333333 +; 8183800/2 = 4091900 + +GNSS-SDR.internal_fs_hz=2045950 ;######### CONTROL_THREAD CONFIG ############ ControlThread.wait_for_flowgraph=false @@ -138,12 +144,14 @@ InputFilter.grid_density=16 ;#InputFilter.IF is the intermediate frequency (in Hz) shifted down to zero Hz ; 8183800/5 = 1636760 -; 8183800/4 = 2727933.33 +; 8183800/4 = 2045950 ; 8183800/3 = 2727933.33333333 -InputFilter.sampling_frequency=8183800 -InputFilter.IF=38400 +; 8183800/2 = 4091900 -InputFilter.decimation_factor=3 +InputFilter.sampling_frequency=8183800 +InputFilter.IF=-38400 + +InputFilter.decimation_factor=4 @@ -173,14 +181,12 @@ Resampler.sample_freq_out=2727933.33 ;######### CHANNELS GLOBAL CONFIG ############ ;#count: Number of available satellite channels. -Channels.count=1 +Channels.count=4 ;#in_acquisition: Number of channels simultaneously acquiring Channels.in_acquisition=1 - -;######### CHANNEL 0 CONFIG ############ -;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS +;#system: GPS, GLONASS, Galileo, SBAS or Compass ;#if the option is disabled by default is assigned GPS -Channel0.system=GPS +Channel.system=GPS ;#signal: ;# "1C" GPS L1 C/A @@ -239,46 +245,24 @@ Channel0.system=GPS ;# "6Q" COMPASS E6 Q ;# "6X" COMPASS E6 IQ ;#if the option is disabled by default is assigned "1C" GPS L1 C/A +Channel.signal=1C + +;######### SPECIFIC CHANNELS CONFIG ###### +;#The following options are specific to each channel and overwrite the generic options + +;######### CHANNEL 0 CONFIG ############ + +Channel0.system=GPS Channel0.signal=1C ;#satellite: Satellite PRN ID for this channel. Disable this option to random search -Channel0.satellite=15 -Channel0.repeat_satellite=false +Channel0.satellite=11 ;######### CHANNEL 1 CONFIG ############ Channel1.system=GPS Channel1.signal=1C Channel1.satellite=18 -Channel1.repeat_satellite=false - -;######### CHANNEL 2 CONFIG ############ - -Channel2.system=GPS -Channel2.signal=1C -Channel2.satellite=16 -Channel2.repeat_satellite=false - -;######### CHANNEL 3 CONFIG ############ - -Channel3.system=GPS -Channel3.signal=1C -Channel3.satellite=21 -Channel3.repeat_satellite=false - -;######### CHANNEL 4 CONFIG ############ - -Channel4.system=GPS -Channel4.signal=1C -Channel4.satellite=3 -Channel4.repeat_satellite=false - -;######### CHANNEL 5 CONFIG ############ - -Channel5.system=GPS -Channel5.signal=1C -;Channel5.satellite=21 -;Channel5.repeat_satellite=false ;######### ACQUISITION GLOBAL CONFIG ############ @@ -293,76 +277,38 @@ Acquisition.item_type=gr_complex Acquisition.if=0 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms] Acquisition.sampled_ms=1 +;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] +Acquisition.implementation=GPS_L1_CA_PCPS_Acquisition +;#threshold: Acquisition threshold +Acquisition.threshold=0.005 +;#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.pfa=0.0001 +;#doppler_max: Maximum expected Doppler shift [Hz] +Acquisition.doppler_max=10000 +;#doppler_max: Doppler step in the grid search [Hz] +Acquisition.doppler_step=500 ;######### ACQUISITION CHANNELS CONFIG ###### +;#The following options are specific to each channel and overwrite the generic options + ;######### ACQUISITION CH 0 CONFIG ############ -;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] -Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition -;#threshold: Acquisition threshold -Acquisition0.threshold=50 -;#doppler_max: Maximum expected Doppler shift [Hz] -Acquisition0.doppler_max=10000 -;#doppler_max: Doppler step in the grid search [Hz] -Acquisition0.doppler_step=250 -;#repeat_satellite: Use only jointly with the satellte PRN ID option. +;Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition +;Acquisition0.threshold=0.005 +;Acquisition0.pfa=0.001 +;Acquisition0.doppler_max=10000 +;Acquisition0.doppler_step=250 +;#repeat_satellite: Use only jointly with the satellite PRN ID option. The default value is false +;Acquisition0.repeat_satellite = false ;######### ACQUISITION CH 1 CONFIG ############ -Acquisition1.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition1.threshold=30 -Acquisition1.doppler_max=10000 -Acquisition1.doppler_step=250 - - -;######### ACQUISITION CH 2 CONFIG ############ -Acquisition2.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition2.threshold=30 -Acquisition2.doppler_max=10000 -Acquisition2.doppler_step=250 - - -;######### ACQUISITION CH 3 CONFIG ############ -Acquisition3.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition3.threshold=30 -Acquisition3.doppler_max=10000 -Acquisition3.doppler_step=250 - - -;######### ACQUISITION CH 4 CONFIG ############ -Acquisition4.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition4.threshold=70 -Acquisition4.doppler_max=10000 -Acquisition4.doppler_step=250 - - -;######### ACQUISITION CH 5 CONFIG ############ -Acquisition5.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition5.threshold=70 -Acquisition5.doppler_max=10000 -Acquisition5.doppler_step=250 - - -;######### ACQUISITION CH 6 CONFIG ############ -Acquisition6.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition6.threshold=70 -Acquisition6.doppler_max=10000 -Acquisition6.doppler_step=250 - - -;######### ACQUISITION CH 7 CONFIG ############ -Acquisition7.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition7.threshold=70 -Acquisition7.doppler_max=10000 -Acquisition7.doppler_step=250 - - -;######### ACQUISITION CH 8 CONFIG ############ -Acquisition8.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition8.threshold=70 -Acquisition8.doppler_max=10000 -Acquisition8.doppler_step=250 - +;Acquisition1.implementation=GPS_L1_CA_PCPS_Acquisition +;Acquisition1.threshold=0.005 +;Acquisition1.pfa=0.001 +;Acquisition1.doppler_max=10000 +;Acquisition1.doppler_step=250 +;Acquisition1.repeat_satellite = false ;######### TRACKING GLOBAL CONFIG ############ @@ -385,7 +331,7 @@ Tracking.dump_filename=./tracking_ch_ Tracking.pll_bw_hz=50.0; ;#dll_bw_hz: DLL loop filter bandwidth [Hz] -Tracking.dll_bw_hz=4.0; +Tracking.dll_bw_hz=2.0; ;#fll_bw_hz: FLL loop filter bandwidth [Hz] Tracking.fll_bw_hz=10.0; diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 413645016..d24d42fd8 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -84,7 +84,7 @@ Channel::Channel(ConfigurationInterface *configuration, unsigned int channel, float threshold = configuration->property("Acquisition" + boost::lexical_cast(channel_) + ".threshold",0.0); - if(threshold==0.0) threshold = configuration->property("Acquisition.threshold",0); + if(threshold==0.0) threshold = configuration->property("Acquisition.threshold",0.0); acq_->set_threshold(threshold);