[hamradio-commits] [gnss-sdr] 65/251: updating configuration, some code cleaning
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 6ec6be2e4cb67f13ca49a1c20cf07e0f125d954f
Merge: 67833c0 3d238a3
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Mon May 11 21:36:39 2015 +0200
updating configuration, some code cleaning
conf/gnss-sdr_Hybrid_short.conf | 115 +++++++-------
...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf | 77 ++++-----
...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf | 80 +++++-----
...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf | 173 +++++++++------------
...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 85 ++--------
.../galileo_e1b_telemetry_decoder_cc.cc | 2 +-
src/core/receiver/gnss_block_factory.cc | 62 ++++----
7 files changed, 254 insertions(+), 340 deletions(-)
diff --cc conf/gnss-sdr_Hybrid_short.conf
index 2d1f7de,2d1f7de..cb50e95
--- a/conf/gnss-sdr_Hybrid_short.conf
+++ b/conf/gnss-sdr_Hybrid_short.conf
@@@ -17,7 -17,7 +17,7 @@@ ControlThread.wait_for_flowgraph=fals
SignalSource.implementation=File_Signal_Source
;#filename: path to file with the captured GNSS signal samples to be processed
--SignalSource.filename=/home/gnss/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
++SignalSource.filename=/datalogger/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
@@@ -155,7 -155,7 +155,7 @@@ Resampler.dump_filename=../data/resampl
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
Resampler.item_type=gr_complex
--;#sample_freq_in: the sample frequency of the input signal
++;#sample_freq_in: the sample frequency of the input signalq
Resampler.sample_freq_in=4000000
;#sample_freq_out: the desired sample frequency of the output signal
@@@ -164,147 -164,147 +164,150 @@@ Resampler.sample_freq_out=400000
;######### CHANNELS GLOBAL CONFIG ############
;#count: Number of available GPS satellite channels.
--Channels_GPS.count=3
++Channels_1C.count=3
;#count: Number of available Galileo satellite channels.
--Channels_Galileo.count=3
++Channels_1B.count=3
;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
Channels.in_acquisition=1
;#signal:
--;#if the option is disabled by default is assigned "1C" GPS L1 C/A
--Channel0.signal=1C
++;# "1C" GPS L1 C/A
++;# "2S" GPS L2 L2C (M)
++;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
++;# "5X" GALILEO E5a I+Q
++Channel0.signal=1B
Channel1.signal=1C
--Channel2.signal=1C
++Channel2.signal=1B
Channel3.signal=1C
Channel4.signal=1B
--Channel5.signal=1B
--Channel6.signal=1B
--Channel7.signal=1B
++Channel5.signal=1C
++;Channel6.signal=1B
++;Channel7.signal=1C
;######### GPS ACQUISITION CONFIG ############
;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--Acquisition_GPS.dump=false
++Acquisition_1C.dump=false
;#filename: Log path and filename
--Acquisition_GPS.dump_filename=./acq_dump.dat
++Acquisition_1C.dump_filename=./acq_dump.dat
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--Acquisition_GPS.item_type=gr_complex
++Acquisition_1C.item_type=gr_complex
;#if: Signal intermediate frequency in [Hz]
--Acquisition_GPS.if=0
++Acquisition_1C.if=0
;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--Acquisition_GPS.sampled_ms=1
++Acquisition_1C.sampled_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_1C.implementation=GPS_L1_CA_PCPS_Acquisition
;#threshold: Acquisition threshold
--Acquisition_GPS.threshold=0.0075
++Acquisition_1C.threshold=0.0075
;#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.01
++;Acquisition_1C.pfa=0.01
;#doppler_max: Maximum expected Doppler shift [Hz]
--Acquisition_GPS.doppler_max=10000
++Acquisition_1C.doppler_max=10000
;#doppler_max: Doppler step in the grid search [Hz]
--Acquisition_GPS.doppler_step=500
++Acquisition_1C.doppler_step=500
;######### GALILEO ACQUISITION CONFIG ############
;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--Acquisition_Galileo.dump=false
++Acquisition_1B.dump=false
;#filename: Log path and filename
--Acquisition_Galileo.dump_filename=./acq_dump.dat
++Acquisition_1B.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_1B.item_type=gr_complex
;#if: Signal intermediate frequency in [Hz]
--Acquisition_Galileo.if=0
++Acquisition_1B.if=0
;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--Acquisition_Galileo.sampled_ms=4
++Acquisition_1B.sampled_ms=4
;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
--Acquisition_Galileo.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
++Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
;#threshold: Acquisition threshold
--;Acquisition_Galileo.threshold=0
++;Acquisition_1B.threshold=0
;#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.0000008
++Acquisition_1B.pfa=0.0000008
;#doppler_max: Maximum expected Doppler shift [Hz]
--Acquisition_Galileo.doppler_max=15000
++Acquisition_1B.doppler_max=15000
;#doppler_max: Doppler step in the grid search [Hz]
--Acquisition_Galileo.doppler_step=125
++Acquisition_1B.doppler_step=125
;######### TRACKING GPS CONFIG ############
;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
--Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
++Tracking_1C.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
++Tracking_1C.item_type=gr_complex
;#sampling_frequency: Signal Intermediate Frequency in [Hz]
--Tracking_GPS.if=0
++Tracking_1C.if=0
;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
--Tracking_GPS.dump=false
++Tracking_1C.dump=false
;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
--Tracking_GPS.dump_filename=../data/epl_tracking_ch_
++Tracking_1C.dump_filename=../data/epl_tracking_ch_
;#pll_bw_hz: PLL loop filter bandwidth [Hz]
--Tracking_GPS.pll_bw_hz=45.0;
++Tracking_1C.pll_bw_hz=45.0;
;#dll_bw_hz: DLL loop filter bandwidth [Hz]
--Tracking_GPS.dll_bw_hz=4.0;
++Tracking_1C.dll_bw_hz=4.0;
;#fll_bw_hz: FLL loop filter bandwidth [Hz]
--Tracking_GPS.fll_bw_hz=10.0;
++Tracking_1C.fll_bw_hz=10.0;
;#order: PLL/DLL loop filter order [2] or [3]
--Tracking_GPS.order=3;
++Tracking_1C.order=3;
;######### TRACKING GALILEO CONFIG ############
;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
--Tracking_Galileo.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
++Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_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_1B.item_type=gr_complex
;#sampling_frequency: Signal Intermediate Frequency in [Hz]
--Tracking_Galileo.if=0
++Tracking_1B.if=0
;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
--Tracking_Galileo.dump=false
++Tracking_1B.dump=false
;#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=../data/veml_tracking_ch_
++Tracking_1B.dump_filename=../data/veml_tracking_ch_
;#pll_bw_hz: PLL loop filter bandwidth [Hz]
--Tracking_Galileo.pll_bw_hz=15.0;
++Tracking_1B.pll_bw_hz=15.0;
;#dll_bw_hz: DLL loop filter bandwidth [Hz]
--Tracking_Galileo.dll_bw_hz=2.0;
++Tracking_1B.dll_bw_hz=2.0;
;#fll_bw_hz: FLL loop filter bandwidth [Hz]
--Tracking_Galileo.fll_bw_hz=10.0;
++Tracking_1B.fll_bw_hz=10.0;
;#order: PLL/DLL loop filter order [2] or [3]
--Tracking_Galileo.order=3;
++Tracking_1B.order=3;
;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] for GPS and [0.15] for Galileo
--Tracking_Galileo.early_late_space_chips=0.15;
++Tracking_1B.early_late_space_chips=0.15;
;#very_early_late_space_chips: only for [Galileo_E1_DLL_PLL_VEML_Tracking], correlator very early-late space [chips]. Use [0.6]
--Tracking_Galileo.very_early_late_space_chips=0.6;
++Tracking_1B.very_early_late_space_chips=0.6;
;######### TELEMETRY DECODER GPS CONFIG ############
;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
--TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder
--TelemetryDecoder_GPS.dump=false
++TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
++TelemetryDecoder_1C.dump=false
;#decimation factor
--TelemetryDecoder_GPS.decimation_factor=4;
++TelemetryDecoder_1C.decimation_factor=4;
;######### TELEMETRY DECODER GALILEO CONFIG ############
;#implementation: Use [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
--TelemetryDecoder_Galileo.implementation=Galileo_E1B_Telemetry_Decoder
--TelemetryDecoder_Galileo.dump=false
--
++TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
++TelemetryDecoder_1B.dump=false
++TelemetryDecoder_1B.decimation_factor=1;
;######### OBSERVABLES CONFIG ############
;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
diff --cc conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
index cd5d7bb,cd5d7bb..fa3d096
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
@@@ -192,28 -192,28 +192,33 @@@ Resampler2.implementation=Pass_Throug
;######### CHANNELS GLOBAL CONFIG ############
;#count: Number of available GPS satellite channels.
--Channels_GPS.count=4
--;#count: Number of available Galileo satellite channels.
--Channels_Galileo.count=0
++Channels_1C.count=4
;#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
++
++
++;#signal:
++;# "1C" GPS L1 C/A
++;# "2S" GPS L2 L2C (M)
++;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
++;# "5X" GALILEO E5a I+Q
;# CHANNEL CONNECTION
Channel0.RF_channel_ID=0
Channel1.RF_channel_ID=0
Channel2.RF_channel_ID=0
Channel3.RF_channel_ID=0
--Channel4.RF_channel_ID=0
--Channel5.RF_channel_ID=0
--Channel6.RF_channel_ID=0
--Channel7.RF_channel_ID=0
++;Channel4.RF_channel_ID=0
++;Channel5.RF_channel_ID=0
++;Channel6.RF_channel_ID=0
++;Channel7.RF_channel_ID=0
;#signal:
;#if the option is disabled by default is assigned "1C" GPS L1 C/A
--Channel.signal=1C
++Channel0.signal=1C
++Channel1.signal=1C
++Channel2.signal=1C
++Channel3.signal=1C
;######### SPECIFIC CHANNELS CONFIG ######
;#The following options are specific to each channel and overwrite the generic options
@@@ -222,31 -222,31 +227,31 @@@
;######### ACQUISITION GLOBAL CONFIG ############
;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--Acquisition_GPS.dump=false
++Acquisition_1C.dump=false
;#filename: Log path and filename
--Acquisition_GPS.dump_filename=./acq_dump.dat
++Acquisition_1C.dump_filename=./acq_dump.dat
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--Acquisition_GPS.item_type=gr_complex
++Acquisition_1C.item_type=gr_complex
;#if: Signal intermediate frequency in [Hz]
--Acquisition_GPS.if=0
++Acquisition_1C.if=0
;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--Acquisition_GPS.coherent_integration_time_ms=1
++Acquisition_1C.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_1C.implementation=GPS_L1_CA_PCPS_Acquisition
;#threshold: Acquisition threshold. It will be ignored if pfa is defined.
--Acquisition_GPS.threshold=0.011
++Acquisition_1C.threshold=0.011
;#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_1C.pfa=0.0001
;#doppler_max: Maximum expected Doppler shift [Hz]
--Acquisition_GPS.doppler_max=10000
++Acquisition_1C.doppler_max=10000
;#doppler_max: Doppler step in the grid search [Hz]
--Acquisition_GPS.doppler_step=250
++Acquisition_1C.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_GPS.bit_transition_flag=false
++Acquisition_1C.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
++Acquisition_1C.max_dwells=1
;######### ACQUISITION CHANNELS CONFIG ######
@@@ -256,40 -256,40 +261,40 @@@
;######### 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_1C.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
++Tracking_1C.item_type=gr_complex
;#sampling_frequency: Signal Intermediate Frequency in [Hz]
--Tracking_GPS.if=0
++Tracking_1C.if=0
;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
--Tracking_GPS.dump=false
++Tracking_1C.dump=false
;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
--Tracking_GPS.dump_filename=./tracking_ch_
++Tracking_1C.dump_filename=./tracking_ch_
;#pll_bw_hz: PLL loop filter bandwidth [Hz]
--Tracking_GPS.pll_bw_hz=40.0;
++Tracking_1C.pll_bw_hz=40.0;
;#dll_bw_hz: DLL loop filter bandwidth [Hz]
--Tracking_GPS.dll_bw_hz=3.0;
++Tracking_1C.dll_bw_hz=3.0;
;#fll_bw_hz: FLL loop filter bandwidth [Hz]
--Tracking_GPS.fll_bw_hz=10.0;
++Tracking_1C.fll_bw_hz=10.0;
;#order: PLL/DLL loop filter order [2] or [3]
--Tracking_GPS.order=3;
++Tracking_1C.order=3;
;#early_late_space_chips: correlator early-late space [chips]. Use [0.5]
--Tracking_GPS.early_late_space_chips=0.5;
++Tracking_1C.early_late_space_chips=0.5;
;######### TELEMETRY DECODER GPS CONFIG ############
;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
--TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder
--TelemetryDecoder_GPS.dump=false
++TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
++TelemetryDecoder_1C.dump=false
;#decimation factor
--TelemetryDecoder_GPS.decimation_factor=1;
++TelemetryDecoder_1C.decimation_factor=1;
;######### OBSERVABLES CONFIG ############
;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
diff --cc conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
index b88f6b6,b88f6b6..7853617
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
@@@ -264,166 -264,166 +264,133 @@@ InputFilter2.output_item_type=gr_comple
;## Resamples the input data.
Resampler2.implementation=Pass_Through
++
;######### CHANNELS GLOBAL CONFIG ############
;#count: Number of available GPS satellite channels.
--Channels_GPS.count=2
--;#count: Number of available Galileo satellite channels.
--Channels_Galileo.count=0
++Channels_1C.count=1
++Channels_2S.count=1
++
;#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, GPS L2C M
++
++;# signal:
++;# "1C" GPS L1 C/A
++;# "2S" GPS L2 L2C (M)
++;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
++;# "5X" GALILEO E5a I+Q
;# CHANNEL CONNECTION
Channel0.RF_channel_ID=0
--Channel0.system=GPS
Channel0.signal=1C
Channel1.RF_channel_ID=1
--Channel1.system=GPS L2C M
Channel1.signal=2S
--Channel2.RF_channel_ID=0
--Channel3.RF_channel_ID=0
--Channel4.RF_channel_ID=0
--Channel5.RF_channel_ID=0
--Channel6.RF_channel_ID=0
--Channel7.RF_channel_ID=0
++;Channel2.RF_channel_ID=0
++;Channel3.RF_channel_ID=0
++;Channel4.RF_channel_ID=0
++;Channel5.RF_channel_ID=0
++;Channel6.RF_channel_ID=0
++;Channel7.RF_channel_ID=0
--;#signal:
--;#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
;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--Acquisition_GPS0.dump=false
++Acquisition_1C0.dump=false
;#filename: Log path and filename
--Acquisition_GPS0.dump_filename=./acq_dump.dat
++Acquisition_1C0.dump_filename=./acq_dump.dat
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--Acquisition_GPS0.item_type=gr_complex
++Acquisition_1C0.item_type=gr_complex
;#if: Signal intermediate frequency in [Hz]
--Acquisition_GPS0.if=0
++Acquisition_1C0.if=0
;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--Acquisition_GPS0.coherent_integration_time_ms=1
++Acquisition_1C0.coherent_integration_time_ms=1
;#implementation: Acquisition algorithm selection for this channel:
--Acquisition_GPS0.implementation=GPS_L1_CA_PCPS_Acquisition
++Acquisition_1C0.implementation=GPS_L1_CA_PCPS_Acquisition
;#threshold: Acquisition threshold. It will be ignored if pfa is defined.
--Acquisition_GPS0.threshold=0.002
++Acquisition_1C0.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_GPS0.pfa=0.0001
++;Acquisition_1C0.pfa=0.0001
;#doppler_max: Maximum expected Doppler shift [Hz]
--Acquisition_GPS0.doppler_max=5000
++Acquisition_1C0.doppler_max=5000
;#doppler_max: Doppler step in the grid search [Hz]
--Acquisition_GPS0.doppler_step=250
++Acquisition_1C0.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_GPS0.bit_transition_flag=false
++Acquisition_1C0.bit_transition_flag=false
;#max_dwells: Maximum number of consecutive dwells to be processed. It will be ignored if bit_transition_flag=true
--Acquisition_GPS0.max_dwells=1
++Acquisition_1C0.max_dwells=1
;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--Acquisition_GPS1.dump=false
++Acquisition_2S1.dump=false
;#filename: Log path and filename
--Acquisition_GPS1.dump_filename=./acq_dump.dat
++Acquisition_2S1.dump_filename=./acq_dump.dat
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--Acquisition_GPS1.item_type=gr_complex
++Acquisition_2S1.item_type=gr_complex
;#if: Signal intermediate frequency in [Hz]
--Acquisition_GPS1.if=0
++Acquisition_2S1.if=0
;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--Acquisition_GPS1.coherent_integration_time_ms=1
++Acquisition_2S1.coherent_integration_time_ms=1
;#implementation: Acquisition algorithm selection for this channel:
--Acquisition_GPS1.implementation=GPS_L2_M_PCPS_Acquisition
++Acquisition_2S1.implementation=GPS_L2_M_PCPS_Acquisition
;#threshold: Acquisition threshold. It will be ignored if pfa is defined.
--Acquisition_GPS1.threshold=0.0005
++Acquisition_2S1.threshold=0.0005
;#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_GPS1.pfa=0.0001
++;Acquisition_2S1.pfa=0.0001
;#doppler_max: Maximum expected Doppler shift [Hz]
--Acquisition_GPS1.doppler_max=5000
++Acquisition_2S1.doppler_max=5000
;#doppler_max: Doppler step in the grid search [Hz]
--Acquisition_GPS1.doppler_step=100
++Acquisition_2S1.doppler_step=100
;#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_GPS1.bit_transition_flag=false
++Acquisition_2S1.bit_transition_flag=false
;#max_dwells: Maximum number of consecutive dwells to be processed. It will be ignored if bit_transition_flag=true
--Acquisition_GPS1.max_dwells=1
--
--
--;######### ACQUISITION GLOBAL CONFIG ############
--
--;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--Acquisition_GPS.dump=true
--;#filename: Log path and filename
--Acquisition_GPS.dump_filename=./acq_dump.dat
--;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--Acquisition_GPS.item_type=gr_complex
--;#if: Signal intermediate frequency in [Hz]
--Acquisition_GPS.if=0
--;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--Acquisition_GPS.coherent_integration_time_ms=1
--;#implementation: Acquisition algorithm selection for this channel:
--Acquisition_GPS.implementation=GPS_L2_M_PCPS_Acquisition
--;#threshold: Acquisition threshold. It will be ignored if pfa is defined.
--Acquisition_GPS.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_GPS.pfa=0.0001
--;#doppler_max: Maximum expected Doppler shift [Hz]
--Acquisition_GPS.doppler_max=5000
--;#doppler_max: Doppler step in the grid search [Hz]
--Acquisition_GPS.doppler_step=100
--;#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
--
--
--;######### ACQUISITION CHANNELS CONFIG ######
--;#The following options are specific to each channel and overwrite the generic options
--
++Acquisition_2S1.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_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
--;#sampling_frequency: Signal Intermediate Frequency in [Hz]
--Tracking_GPS.if=0
--;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
--Tracking_GPS.dump=false
++;######### TRACKING CONFIG ############
--;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
--Tracking_GPS.dump_filename=./tracking_ch_
++;######### TRACKING CHANNEL 0 CONFIG ############
++Tracking_1C0.implementation=GPS_L1_CA_DLL_PLL_Tracking
++Tracking_1C0.item_type=gr_complex
++Tracking_1C0.if=0
++Tracking_1C0.dump=false
++Tracking_1C0.dump_filename=./tracking_ch_
++Tracking_1C0.pll_bw_hz=40.0;
++Tracking_1C0.dll_bw_hz=3.0;
++Tracking_1C0.fll_bw_hz=10.0;
++Tracking_1C0.order=3;
++Tracking_1C0.early_late_space_chips=0.5;
--;#pll_bw_hz: PLL loop filter bandwidth [Hz]
--Tracking_GPS.pll_bw_hz=40.0;
--;#dll_bw_hz: DLL loop filter bandwidth [Hz]
--Tracking_GPS.dll_bw_hz=3.0;
++;######### TRACKING CHANNEL 11 CONFIG ############
++Tracking_2S1.implementation=GPS_L2_M_DLL_PLL_Tracking
++Tracking_2S1.item_type=gr_complex
++Tracking_2S1.if=0
++Tracking_2S1.dump=false
++Tracking_2S1.dump_filename=./tracking_ch_
++Tracking_2S1.pll_bw_hz=2.0;
++Tracking_2S1.dll_bw_hz=0.5;
++Tracking_2S1.fll_bw_hz=2.0;
++Tracking_2S1.order=2;
++Tracking_2S1.early_late_space_chips=0.5;
--;#fll_bw_hz: FLL loop filter bandwidth [Hz]
--Tracking_GPS.fll_bw_hz=10.0;
--;#order: PLL/DLL loop filter order [2] or [3]
--Tracking_GPS.order=3;
++;######### TELEMETRY DECODER CONFIG ############
++TelemetryDecoder_1C0.implementation=GPS_L1_CA_Telemetry_Decoder
++TelemetryDecoder_1C0.dump=false
++TelemetryDecoder_1C0.decimation_factor=20;
--;#early_late_space_chips: correlator early-late space [chips]. Use [0.5]
--Tracking_GPS.early_late_space_chips=0.5;
++TelemetryDecoder_2S1.implementation=GPS_L2_M_Telemetry_Decoder
++TelemetryDecoder_2S1.dump=false
++TelemetryDecoder_2S1.decimation_factor=1;
--;######### TELEMETRY DECODER GPS CONFIG ############
--;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
--TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder
--TelemetryDecoder_GPS.dump=false
--;#decimation factor
--TelemetryDecoder_GPS.decimation_factor=1;
;######### OBSERVABLES CONFIG ############
;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
diff --cc conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
index 45bc76a,45bc76a..c8d6199
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
@@@ -273,79 -273,79 +273,65 @@@ Channels_2S.count=
;Channels_Galileo.count=0
;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
Channels.in_acquisition=2
--;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
--;#if the option is disabled by default is assigned GPS
--;Channel.system=GPS, GPS L2C M
++
++
++;#signal:
++;# "1C" GPS L1 C/A
++;# "2S" GPS L2 L2C (M)
++;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
++;# "5X" GALILEO E5a I+Q
++
;# CHANNEL CONNECTION
Channel0.RF_channel_ID=0
--;Channel0.system=GPS
Channel0.signal=1C
Channel1.RF_channel_ID=0
--;Channel1.system=GPS
Channel1.signal=1C
Channel2.RF_channel_ID=0
--;Channel2.system=GPS
Channel2.signal=1C
Channel3.RF_channel_ID=0
--;Channel3.system=GPS
Channel3.signal=1C
Channel4.RF_channel_ID=0
--;Channel4.system=GPS
Channel4.signal=1C
Channel5.RF_channel_ID=0
--;Channel5.system=GPS
Channel5.signal=1C
Channel6.RF_channel_ID=0
--;Channel6.system=GPS
Channel6.signal=1C
Channel7.RF_channel_ID=0
--;Channel7.system=GPS
Channel7.signal=1C
Channel8.RF_channel_ID=1
--;Channel8.system=GPS L2C M
Channel8.signal=2S
Channel9.RF_channel_ID=1
--;Channel9.system=GPS L2C M
Channel9.signal=2S
Channel10.RF_channel_ID=1
--;Channel10.system=GPS L2C M
Channel10.signal=2S
Channel11.RF_channel_ID=1
--;Channel11.system=GPS L2C M
Channel11.signal=2S
Channel12.RF_channel_ID=1
--;Channel12.system=GPS L2C M
Channel12.signal=2S
Channel13.RF_channel_ID=1
--;Channel13.system=GPS L2C M
Channel13.signal=2S
Channel14.RF_channel_ID=1
--;Channel14.system=GPS L2C M
Channel14.signal=2S
Channel15.RF_channel_ID=1
--;Channel15.system=GPS L2C M
Channel15.signal=2S
--;#signal:
--;#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
@@@ -553,34 -553,34 +539,6 @@@ Acquisition_2S15.doppler_min=-500
Acquisition_2S15.doppler_step=100
Acquisition_2S15.max_dwells=1
--;######### ACQUISITION GLOBAL CONFIG ############
--
--;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
--;.dump=true
--;#filename: Log path and filename
--;Acquisition_GPS.dump_filename=./acq_dump.dat
--;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
--;Acquisition_GPS.item_type=gr_complex
--;#if: Signal intermediate frequency in [Hz]
--;Acquisition_GPS.if=0
--;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
--;Acquisition_GPS.coherent_integration_time_ms=1
--;#implementation: Acquisition algorithm selection for this channel:
--;Acquisition_GPS.implementation=GPS_L2_M_PCPS_Acquisition
--;#threshold: Acquisition threshold. It will be ignored if pfa is defined.
--;Acquisition_GPS.threshold=0.003
--;#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
--;#doppler_max: Maximum expected Doppler shift [Hz]
--;Acquisition_GPS.doppler_max=5000
--;#doppler_max: Doppler step in the grid search [Hz]
--;Acquisition_GPS.doppler_step=100
--;#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
;######### ACQUISITION CHANNELS CONFIG ######
@@@ -768,35 -768,35 +726,10 @@@ Tracking_2S15.order=2
Tracking_2S15.early_late_space_chips=0.5;
--;######### 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_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
--;#sampling_frequency: Signal Intermediate Frequency in [Hz]
--;Tracking_GPS.if=0
--;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
--;Tracking_GPS.dump=false
--;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
--;Tracking_GPS.dump_filename=./tracking_ch_
--;#pll_bw_hz: PLL loop filter bandwidth [Hz]
--;Tracking_GPS.pll_bw_hz=40.0;
--;#dll_bw_hz: DLL loop filter bandwidth [Hz]
--;Tracking_GPS.dll_bw_hz=3.0;
--;#fll_bw_hz: FLL loop filter bandwidth [Hz]
--;Tracking_GPS.fll_bw_hz=10.0;
--;#order: PLL/DLL loop filter order [2] or [3]
--;Tracking_GPS.order=3;
--;#early_late_space_chips: correlator early-late space [chips]. Use [0.5]
--;Tracking_GPS.early_late_space_chips=0.5;
++
;######### TELEMETRY DECODER GPS CONFIG ############
;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
--;TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder
--;TelemetryDecoder_GPS.dump=false
--;#decimation factor
--;TelemetryDecoder_GPS.decimation_factor=1;
TelemetryDecoder_1C0.implementation=GPS_L1_CA_Telemetry_Decoder
TelemetryDecoder_1C0.dump=false
diff --cc src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
index 75c8de2,75c8de2..3b82940
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
@@@ -129,7 -129,7 +129,7 @@@ galileo_e1b_telemetry_decoder_cc::galil
d_queue = queue;
d_dump = dump;
d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
-- LOG(INFO) << "GALILEO E1B TELEMETRY PROCESSING: satellite " << d_satellite;
++ LOG(INFO) << "Initializing GALILEO E1B TELEMETRY PROCESSING";
d_vector_length = vector_length;
d_samples_per_symbol = ( Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS ) / Galileo_E1_B_SYMBOL_RATE_BPS;
d_fs_in = fs_in;
diff --cc src/core/receiver/gnss_block_factory.cc
index 769ccbf,efc8b41..3742a72
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@@ -96,27 -96,27 +96,27 @@@
#include "hybrid_pvt.h"
#if OPENCL_BLOCKS
-- #include "gps_l1_ca_pcps_opencl_acquisition.h"
++#include "gps_l1_ca_pcps_opencl_acquisition.h"
#endif
#if GN3S_DRIVER
-- #include "gn3s_signal_source.h"
++#include "gn3s_signal_source.h"
#endif
#if RAW_ARRAY_DRIVER
-- #include "raw_array_signal_source.h"
++#include "raw_array_signal_source.h"
#endif
#if OSMOSDR_DRIVER
-- #include "osmosdr_signal_source.h"
++#include "osmosdr_signal_source.h"
#endif
#if UHD_DRIVER
-- #include "uhd_signal_source.h"
++#include "uhd_signal_source.h"
#endif
#if FLEXIBAND_DRIVER
-- #include "flexiband_signal_source.h"
++#include "flexiband_signal_source.h"
#endif
@@@ -335,7 -335,7 +335,7 @@@ std::unique_ptr<GNSSBlockInterface> GNS
LOG(INFO) << "Instantiating Channel " << channel << " with Acquisition Implementation: "
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
-- std::string aux = configuration->property("Acquisition_1C" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
++ std::string aux = configuration->property("Acquisition_1C" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
std::string appendix1;
if(aux.compare("W") != 0)
{
@@@ -389,7 -389,7 +389,7 @@@ std::unique_ptr<GNSSBlockInterface> GNS
LOG(INFO) << "Instantiating Channel " << channel << " with Acquisition Implementation: "
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
-- std::string aux = configuration->property("Acquisition_2S" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
++ std::string aux = configuration->property("Acquisition_2S" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
std::string appendix1;
if(aux.compare("W") != 0)
{
@@@ -446,7 -446,7 +446,7 @@@ std::unique_ptr<GNSSBlockInterface> GNS
std::string id = stream.str();
LOG(INFO) << "Instantiating Channel " << id << " with Acquisition Implementation: "
<< acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm;
-- std::string aux = configuration->property("Acquisition_Galileo" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
++ std::string aux = configuration->property("Acquisition_Galileo" + boost::lexical_cast<std::string>(channel) + ".implementation", std::string("W"));
std::string appendix1;
if(aux.compare("W") != 0)
{
@@@ -726,17 -726,17 +726,17 @@@ std::unique_ptr<std::vector<std::unique
// Push back the channel to the vector of channels, if apply.
if((configuration->property("Channels_GPS.count", 0) > 0) and apply_)
-- {
-- channels->at(i) = std::move(GetChannel_GPS(configuration,
-- acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
-- channel_absolute_id++;
-- }
++ {
++ channels->at(i) = std::move(GetChannel_GPS(configuration,
++ acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
++ channel_absolute_id++;
++ }
if((configuration->property("Channels_1C.count", 0) > 0) and apply_)
-- {
-- channels->at(i) = std::move(GetChannel_1C(configuration,
-- acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
-- channel_absolute_id++;
-- }
++ {
++ channels->at(i) = std::move(GetChannel_1C(configuration,
++ acquisition_implementation, tracking_implementation, telemetry_decoder_implementation, i, queue));
++ channel_absolute_id++;
++ }
}
//**************** GPS L2C (M) CHANNELS **********************
@@@ -812,8 -812,8 +812,8 @@@
{
channel_count = configuration->property("Channels_1B.count", 0);
}
--
-- LOG(INFO) << "Getting " << channel_count << " Galileo E1 B (I/NAV OS) channels";
++
++ LOG(INFO) << "Getting " << channel_count << " Galileo E1 B (I/NAV OS) channels";
tracking_implementation = configuration->property("Tracking_Galileo.implementation", default_implementation); // DEPRECATED
if (tracking_implementation.compare(default_implementation) == 0)
@@@ -1283,11 -1282,11 +1283,11 @@@ std::unique_ptr<GNSSBlockInterface> GNS
block = std::move(block_);
}
else if (implementation.compare("Galileo_volk_E1_DLL_PLL_VEML_Tracking") == 0)
-- {
-- std::unique_ptr<GNSSBlockInterface> block_(new GalileoVolkE1DllPllVemlTracking(configuration.get(), role, in_streams,
-- out_streams, queue));
-- block = std::move(block_);
-- }
++ {
++ std::unique_ptr<GNSSBlockInterface> block_(new GalileoVolkE1DllPllVemlTracking(configuration.get(), role, in_streams,
++ out_streams, queue));
++ block = std::move(block_);
++ }
else if (implementation.compare("Galileo_E1_TCP_CONNECTOR_Tracking") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1TcpConnectorTracking(configuration.get(), role, in_streams,
@@@ -1542,11 -1541,11 +1542,11 @@@ std::unique_ptr<TrackingInterface> GNSS
block = std::move(block_);
}
else if (implementation.compare("Galileo_Volk_E1_DLL_PLL_VEML_Tracking") == 0)
-- {
-- std::unique_ptr<TrackingInterface> block_(new GalileoVolkE1DllPllVemlTracking(configuration.get(), role, in_streams,
-- out_streams, queue));
-- block = std::move(block_);
-- }
++ {
++ std::unique_ptr<TrackingInterface> block_(new GalileoVolkE1DllPllVemlTracking(configuration.get(), role, in_streams,
++ out_streams, queue));
++ block = std::move(block_);
++ }
else if (implementation.compare("Galileo_E1_TCP_CONNECTOR_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GalileoE1TcpConnectorTracking(configuration.get(), role, in_streams,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list