From 8dc9ee1b928136e8722ea401544574294d339523 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 29 Jan 2018 18:56:02 +0100 Subject: [PATCH] Remove unneded parameters and misleading comments --- conf/gnss-sdr.conf | 7 ++----- conf/gnss-sdr_GPS_L1_CA_ibyte.conf | 2 +- conf/gnss-sdr_GPS_L1_GN3S_realtime.conf | 2 +- conf/gnss-sdr_GPS_L1_SPIR.conf | 2 +- conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf | 4 ++-- conf/gnss-sdr_GPS_L1_USRP_realtime.conf | 4 ++-- conf/gnss-sdr_GPS_L1_acq_QuickSync.conf | 5 +---- conf/gnss-sdr_GPS_L1_gr_complex.conf | 1 - conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf | 1 - conf/gnss-sdr_GPS_L1_ishort.conf | 1 - conf/gnss-sdr_GPS_L1_nsr.conf | 1 - conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf | 1 - ...s-sdr_GPS_L1_pulse_blanking_gr_complex.conf | 7 ++----- conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf | 2 +- conf/gnss-sdr_GPS_L1_two_bits_cpx.conf | 1 - conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf | 5 +---- conf/gnss-sdr_Galileo_E1_ishort.conf | 2 +- conf/gnss-sdr_Galileo_E1_nsr.conf | 1 - conf/gnss-sdr_Galileo_E5a.conf | 7 ++----- conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf | 1 - conf/gnss-sdr_Hybrid_byte.conf | 7 ++----- conf/gnss-sdr_Hybrid_byte_sim.conf | 7 ++----- conf/gnss-sdr_Hybrid_gr_complex.conf | 7 ++----- conf/gnss-sdr_Hybrid_ishort.conf | 7 ++----- conf/gnss-sdr_Hybrid_nsr.conf | 7 ++----- ...dr_galileo_E1_extended_correlator_byte.conf | 11 +++-------- ..._galileo_E1_extended_correlator_labsat.conf | 9 +++------ ...annel_GPS_L1_Flexiband_realtime_III_1a.conf | 2 +- ...annel_GPS_L1_Flexiband_realtime_III_1b.conf | 2 +- ...hannel_GPS_L1_Flexiband_realtime_II_3b.conf | 2 +- ...channel_GPS_L1_Flexiband_realtime_I_1b.conf | 2 +- ...el_GPS_L1_L2_Flexiband_realtime_III_1b.conf | 2 +- ..._Galileo_E1B_Flexiband_bin_file_III_1b.conf | 2 +- ...multichannel_GPS_L1_USRP_X300_realtime.conf | 2 +- ...nel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 2 +- ...PS_L2_M_Flexiband_bin_file_III_1b_real.conf | 2 +- ...l_all_in_one_Flexiband_bin_file_III_1b.conf | 2 +- conf/gnss-sdr_multisource_Hybrid_ishort.conf | 8 ++------ conf/gnss-sdr_multisource_Hybrid_nsr.conf | 18 +++--------------- 39 files changed, 48 insertions(+), 110 deletions(-) diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index 6ffffd631..bb409adfe 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -34,12 +34,9 @@ SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SP ;#item_type: Type and resolution for each of the signal samples. SignalSource.item_type=ishort -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_GPS_L1_CA_ibyte.conf b/conf/gnss-sdr_GPS_L1_CA_ibyte.conf index d2d501308..970730bc6 100644 --- a/conf/gnss-sdr_GPS_L1_CA_ibyte.conf +++ b/conf/gnss-sdr_GPS_L1_CA_ibyte.conf @@ -1,7 +1,7 @@ [GNSS-SDR] ;######### GLOBAL OPTIONS ################## -GNSS-SDR.internal_fs_hz=6625000 +GNSS-SDR.internal_fs_sps=6625000 ;######### SIGNAL_SOURCE CONFIG ############ SignalSource.implementation=File_Signal_Source diff --git a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf index e2c156cec..869eb560e 100644 --- a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf @@ -10,7 +10,7 @@ GNSS-SDR.internal_fs_sps=2727933.33 ; 8183800/3 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation: ;#Notes for GN3S source: ; - The front-end sampling frequency is fixed to 8.1838 MSPS (8183800 Hz). ; - The baseband signal is shifted to an IF of 38400 Hz. It should be corrected with the signal conditioner block diff --git a/conf/gnss-sdr_GPS_L1_SPIR.conf b/conf/gnss-sdr_GPS_L1_SPIR.conf index 0799f82c5..119ac2326 100644 --- a/conf/gnss-sdr_GPS_L1_SPIR.conf +++ b/conf/gnss-sdr_GPS_L1_SPIR.conf @@ -11,7 +11,7 @@ GNSS-SDR.internal_fs_sps=4000000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Spir_File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf index 094d1f1d8..8daff7717 100644 --- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf @@ -26,7 +26,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -; # implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +; # implementation: SignalSource.implementation=UHD_Signal_Source ; # When left empty, the device discovery routines will search all vailable transports on the system (ethernet, usb...) @@ -36,7 +36,7 @@ SignalSource.device_address=192.168.40.2 ; <- PUT THE IP ADDRESS OF YOUR USRP HE ;SignalSource.item_type=gr_complex SignalSource.item_type=cshort -; # sampling_frequency: Original Signal sampling frequency in [Hz] +; # sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 ; # freq: RF front-end center frequency in [Hz] diff --git a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf index 64db841fa..7ebe15dbf 100644 --- a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=UHD_Signal_Source ;#When left empty, the device discovery routines will search all available transports on the system (ethernet, usb...) @@ -34,7 +34,7 @@ SignalSource.implementation=UHD_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=gr_complex -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=2000000 ;#freq: RF front-end center frequency in [Hz] diff --git a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf index 02fa2ff35..25efa3289 100644 --- a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf +++ b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf @@ -23,12 +23,9 @@ SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SP SignalSource.item_type=ishort -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_GPS_L1_gr_complex.conf b/conf/gnss-sdr_GPS_L1_gr_complex.conf index 3cf123514..c1ce3231f 100644 --- a/conf/gnss-sdr_GPS_L1_gr_complex.conf +++ b/conf/gnss-sdr_GPS_L1_gr_complex.conf @@ -14,7 +14,6 @@ SignalSource.implementation=File_Signal_Source SignalSource.filename=/home/javier/gnss/gnss-simulator/build/signal_out.bin ; <- PUT YOUR FILE HERE SignalSource.item_type=byte SignalSource.sampling_frequency=2600000 -SignalSource.freq=1575420000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf index e7e8f4e62..cd64d56e7 100644 --- a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf +++ b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf @@ -14,7 +14,6 @@ SignalSource.implementation=File_Signal_Source SignalSource.filename=/datalogger/signals/Agilent/New York/4msps.dat ; <- PUT YOUR FILE HERE SignalSource.item_type=gr_complex SignalSource.sampling_frequency=4000000 -SignalSource.freq=1575420000 SignalSource.samples=250000000 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf index f496c9eff..fb920bb57 100644 --- a/conf/gnss-sdr_GPS_L1_ishort.conf +++ b/conf/gnss-sdr_GPS_L1_ishort.conf @@ -16,7 +16,6 @@ SignalSource.implementation=File_Signal_Source SignalSource.filename=/archive/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE SignalSource.item_type=ishort SignalSource.sampling_frequency=4000000 -SignalSource.freq=1575420000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_GPS_L1_nsr.conf b/conf/gnss-sdr_GPS_L1_nsr.conf index 078f8e690..56c865f4b 100644 --- a/conf/gnss-sdr_GPS_L1_nsr.conf +++ b/conf/gnss-sdr_GPS_L1_nsr.conf @@ -31,7 +31,6 @@ SignalSource.implementation=Nsr_File_Signal_Source SignalSource.filename=/home/javier/Descargas/RoofTop_FE0_Band1.stream ; <- PUT YOUR FILE HERE SignalSource.item_type=byte SignalSource.sampling_frequency=20480000 -SignalSource.freq=1575420000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf index f3bac7589..36c28c69a 100644 --- a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf +++ b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf @@ -46,7 +46,6 @@ SignalSource.big_endian_bytes=false ; This setting specifies which of the three cases holds for this data file SignalSource.sample_type=real SignalSource.sampling_frequency=20480000 -SignalSource.freq=1575420000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf b/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf index 2ce06d573..50becf691 100644 --- a/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf +++ b/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#When left empty, the device discovery routines will search all vailable transports on the system (ethernet, usb...) @@ -37,12 +37,9 @@ SignalSource.filename=/home/javier/signals/signal_source_int.dat ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=gr_complex -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=2000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#gain: Front-end Gain in [dB] SignalSource.gain=40 diff --git a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf index 468c44de7..08a75a83e 100644 --- a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf @@ -27,7 +27,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] [Osmosdr_Signal_Source] +;#implementation SignalSource.implementation=RtlTcp_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. diff --git a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf index a720b859b..e3a32c42e 100644 --- a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf +++ b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf @@ -28,7 +28,6 @@ SignalSource.implementation=Two_Bit_Cpx_File_Signal_Source SignalSource.filename=/datalogger/captures/ajith/test1_two_cpx_live.dat ; <- PUT YOUR FILE HERE SignalSource.item_type=byte SignalSource.sampling_frequency=19200000 -SignalSource.freq=1575420000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf index 52df58dc9..fa8d8bb61 100644 --- a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf +++ b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf @@ -21,12 +21,9 @@ SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SP ;#If ishort is selected you should have to instantiate the Ishort_To_Complex data_type_adapter. SignalSource.item_type=ishort -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_Galileo_E1_ishort.conf b/conf/gnss-sdr_Galileo_E1_ishort.conf index 208571be0..08e31a9e9 100644 --- a/conf/gnss-sdr_Galileo_E1_ishort.conf +++ b/conf/gnss-sdr_Galileo_E1_ishort.conf @@ -19,7 +19,7 @@ SignalSource.filename=/Users/carlesfernandez/Documents/workspace/code2/trunk/dat ;#item_type: Type and resolution for each of the signal samples. SignalSource.item_type=ishort -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 ;#freq: RF front-end center frequency in [Hz] diff --git a/conf/gnss-sdr_Galileo_E1_nsr.conf b/conf/gnss-sdr_Galileo_E1_nsr.conf index 4cf3f213c..9c183a233 100644 --- a/conf/gnss-sdr_Galileo_E1_nsr.conf +++ b/conf/gnss-sdr_Galileo_E1_nsr.conf @@ -17,7 +17,6 @@ SignalSource.implementation=Nsr_File_Signal_Source SignalSource.filename=/datalogger/signals/ifen/E1L1_FE0_Band0.stream ; <- PUT YOUR FILE HERE SignalSource.item_type=byte SignalSource.sampling_frequency=20480000 -SignalSource.freq=1575420000 SignalSource.samples=0 ; 0 means the entire file SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_Galileo_E5a.conf b/conf/gnss-sdr_Galileo_E5a.conf index 0845e1dff..515b41fc6 100644 --- a/conf/gnss-sdr_Galileo_E5a.conf +++ b/conf/gnss-sdr_Galileo_E5a.conf @@ -25,7 +25,7 @@ GNSS-SDR.internal_fs_sps=32000000 ;GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -34,12 +34,9 @@ SignalSource.filename=/datalogger/signals/ifen/32MS_complex.dat ; <- PUT YOUR F ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=gr_complex -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=32000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1176450000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf index 8d4e1bc0b..bba38b048 100644 --- a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf +++ b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf @@ -28,7 +28,6 @@ SignalSource.implementation=File_Signal_Source SignalSource.filename=/datalogger/signals/ifen/Galileo_E5ab_IFEN_CTTC_run1.dat ; <- PUT YOUR FILE HERE SignalSource.item_type=gr_complex SignalSource.sampling_frequency=50000000 -SignalSource.freq=1176450000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false diff --git a/conf/gnss-sdr_Hybrid_byte.conf b/conf/gnss-sdr_Hybrid_byte.conf index 44aa298f6..92d7511ae 100644 --- a/conf/gnss-sdr_Hybrid_byte.conf +++ b/conf/gnss-sdr_Hybrid_byte.conf @@ -11,7 +11,7 @@ GNSS-SDR.internal_fs_sps=20000000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -20,12 +20,9 @@ SignalSource.filename=/datalogger/signals/Fraunhofer/L125_III1b_210s_L1.bin ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=byte -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=20000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_Hybrid_byte_sim.conf b/conf/gnss-sdr_Hybrid_byte_sim.conf index 5de0b699f..420810fb2 100644 --- a/conf/gnss-sdr_Hybrid_byte_sim.conf +++ b/conf/gnss-sdr_Hybrid_byte_sim.conf @@ -12,7 +12,7 @@ GNSS-SDR.internal_fs_sps=2600000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -22,12 +22,9 @@ SignalSource.filename=/Users/carlesfernandez/git/cttc/build/signal_out.bin ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=byte -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_Hybrid_gr_complex.conf b/conf/gnss-sdr_Hybrid_gr_complex.conf index 684c24af7..68b0f984f 100644 --- a/conf/gnss-sdr_Hybrid_gr_complex.conf +++ b/conf/gnss-sdr_Hybrid_gr_complex.conf @@ -10,7 +10,7 @@ GNSS-SDR.internal_fs_sps=4092000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] [Nsr_File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -19,12 +19,9 @@ SignalSource.filename=/datalogger/signals/sim/GPS_sim1.dat ; <- PUT YOUR FI ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=gr_complex -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4092000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_Hybrid_ishort.conf b/conf/gnss-sdr_Hybrid_ishort.conf index 8e4989aeb..26c27e2ce 100644 --- a/conf/gnss-sdr_Hybrid_ishort.conf +++ b/conf/gnss-sdr_Hybrid_ishort.conf @@ -26,7 +26,7 @@ GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -35,12 +35,9 @@ SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SP ;#item_type: Type and resolution for each of the signal samples. SignalSource.item_type=ishort -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=4000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_Hybrid_nsr.conf b/conf/gnss-sdr_Hybrid_nsr.conf index a65244110..aa3d970d8 100644 --- a/conf/gnss-sdr_Hybrid_nsr.conf +++ b/conf/gnss-sdr_Hybrid_nsr.conf @@ -13,7 +13,7 @@ GNSS-SDR.internal_fs_sps=2560000 ;GNSS-SDR.internal_fs_sps=5120000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] [Nsr_File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Nsr_File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -22,12 +22,9 @@ SignalSource.filename=/media/javier/SISTEMA/signals/ifen/E1L1_FE0_Band0.stream ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=byte -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=20480000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf b/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf index fb6a08fc0..d6f7aa3b6 100644 --- a/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf +++ b/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf @@ -11,23 +11,18 @@ GNSS-SDR.internal_fs_sps=20000000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed -;SignalSource.filename=/home/javier/signals/L125_III1b_210s_L1_2msps.bin ; <- PUT YOUR FILE HERE - -SignalSource.filename=/media/javier/SISTEMA/signals/fraunhofer/L125_III1b_210s_L1.bin +SignalSource.filename=/media/javier/SISTEMA/signals/fraunhofer/L125_III1b_210s_L1.bin ; <- PUT YOUR FILE HERE ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=byte -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=20000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf b/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf index 094f15ebe..7b3c059fb 100644 --- a/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf +++ b/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf @@ -10,13 +10,13 @@ GNSS-SDR.internal_fs_hz=5456000 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] [Nsr_File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Labsat_Signal_Source SignalSource.selected_channel=1 ;#filename: path to file with the captured GNSS signal samples to be processed -;# Labsat sile source automatically increments the file name when the signal is splitted in several files +;# Labsat sile source automatically increments the file name when the signal is split in several files ;# the adapter adds "_0000.LS3" to this base path and filename. Next file will be "_0001.LS3" and so on ;# in this example, the first file complete path will be ../signals/GPS_025_0000.LS3 @@ -25,12 +25,9 @@ SignalSource.filename=../signals/GPS_025 ; <- PUT YOUR FILE HERE ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource.item_type=gr_complex -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource.sampling_frequency=16368000 -;#freq: RF front-end center frequency in [Hz] -SignalSource.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource.samples=0 diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf index ef35f1207..c7824e242 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf index 859c41ba2..06aabba4f 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf index f95cdba22..14367f2d8 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf index 4860367dc..89d81f8ff 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf index 37a7f89be..4d075265e 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf index e3c724fad..2a8e629c7 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source SignalSource.flag_read_file=true diff --git a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf index 541ef7b8b..eaa8b494c 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=UHD_Signal_Source ;#When left empty, the device discovery routines will search all vailable transports on the system (ethernet, usb...) diff --git 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 index 50cd9d1cb..29f2720dd 100644 --- 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 @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source SignalSource.flag_read_file=true diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf index ce8f87a9f..66d6b6a12 100644 --- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf +++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source SignalSource.flag_read_file=true diff --git a/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf index e03a01dbe..9ab64a11a 100644 --- a/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf +++ b/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf @@ -25,7 +25,7 @@ GNSS-SDR.SUPL_LAC=0x59e2 GNSS-SDR.SUPL_CI=0x31b0 ;######### SIGNAL_SOURCE CONFIG ############ -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource.implementation=Flexiband_Signal_Source SignalSource.flag_read_file=true diff --git a/conf/gnss-sdr_multisource_Hybrid_ishort.conf b/conf/gnss-sdr_multisource_Hybrid_ishort.conf index 71571955e..d80bc3050 100644 --- a/conf/gnss-sdr_multisource_Hybrid_ishort.conf +++ b/conf/gnss-sdr_multisource_Hybrid_ishort.conf @@ -20,8 +20,7 @@ SignalSource.repeat=false ;######### SIGNAL_SOURCE 0 CONFIG ############ - -;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource0.implementation=File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -30,12 +29,9 @@ SignalSource0.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_S ;#item_type: Type and resolution for each of the signal samples. SignalSource0.item_type=ishort -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource0.sampling_frequency=4000000 -;#freq: RF front-end center frequency in [Hz] -SignalSource0.freq=1575420000 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource0.samples=0 diff --git a/conf/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/gnss-sdr_multisource_Hybrid_nsr.conf index deee952af..cc151286e 100644 --- a/conf/gnss-sdr_multisource_Hybrid_nsr.conf +++ b/conf/gnss-sdr_multisource_Hybrid_nsr.conf @@ -23,7 +23,7 @@ SignalSource.repeat=false ;######### SIGNAL_SOURCE 0 CONFIG ############ -;#implementation: Use [File_Signal_Source] [Nsr_File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental) +;#implementation SignalSource0.implementation=Nsr_File_Signal_Source ;#filename: path to file with the captured GNSS signal samples to be processed @@ -32,15 +32,9 @@ SignalSource0.filename=/datalogger/signals/ifen/E1L1_FE0_Band0.stream ; <- PUT ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource0.item_type=byte -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource0.sampling_frequency=20480000 -;#freq: RF front-end center frequency in [Hz] -SignalSource0.freq=1575420000 - -;#subdevice: UHD subdevice specification (for USRP1 use A:0 or B:0) -SignalSource0.subdevice=B:0 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource0.samples=0 @@ -59,15 +53,9 @@ SignalSource1.filename=/datalogger/signals/ifen/E1L1_FE0_Band0.stream ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version. SignalSource1.item_type=byte -;#sampling_frequency: Original Signal sampling frequency in [Hz] +;#sampling_frequency: Original Signal sampling frequency in samples per second SignalSource1.sampling_frequency=20480000 -;#freq: RF front-end center frequency in [Hz] -SignalSource1.freq=1575420000 - -;#subdevice: UHD subdevice specification (for USRP1 use A:0 or B:0) -SignalSource1.subdevice=B:0 - ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file. SignalSource1.samples=0