From b5a5b9a2981ea9839072ac0f1584e2d548bd0291 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 4 Oct 2024 17:09:19 +0200 Subject: [PATCH 01/14] Fix issues in some IDEs --- .../volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h index 07eb3f849..63b1bd429 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/msvc/sys/time.h @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Carles Fernandez-Prades #ifndef _MSC_VER // [ #error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] +#else #ifndef _MSC_SYS_TIME_H #define _MSC_SYS_TIME_H @@ -72,3 +72,6 @@ static inline int gettimeofday(struct timeval *tv, struct timezone *tz) return 0; } + +#endif // _MSC_SYS_TIME_H +#endif // _MSC_VER \ No newline at end of file From 2a98217f25c740f7d0369b757ebd0d31b571cf24 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 4 Oct 2024 19:43:07 +0200 Subject: [PATCH 02/14] Remove references to the data folder --- README.md | 10 +- conf/File_input/GPS/gnss-sdr-L1-gaussian.conf | 4 +- conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf | 6 +- .../GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf | 6 +- .../GPS/gnss-sdr_GPS_L1_gr_complex.conf | 4 +- .../GPS/gnss-sdr_GPS_L1_ishort.conf | 2 +- ...nnel_GPS_L1_Flexiband_bin_file_III_1a.conf | 8 +- ...nnel_GPS_L1_Flexiband_realtime_III_1a.conf | 6 +- ...nnel_GPS_L1_Flexiband_realtime_III_1b.conf | 6 +- ...annel_GPS_L1_Flexiband_realtime_II_3b.conf | 6 +- ...hannel_GPS_L1_Flexiband_realtime_I_1b.conf | 6 +- ...l_GPS_L1_L2_Flexiband_realtime_III_1b.conf | 6 +- ...Galileo_E1B_Flexiband_bin_file_III_1b.conf | 10 +- ...el_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 10 +- ...S_L2_M_Flexiband_bin_file_III_1b_real.conf | 8 +- .../gnss-sdr_Galileo_E1_acq_QuickSync.conf | 200 +++++++++--------- .../Galileo/gnss-sdr_Galileo_E1_ishort.conf | 4 +- .../Galileo/gnss-sdr_Galileo_E1_nsr.conf | 6 +- .../gnss-sdr_Galileo_E5a_IFEN_CTTC.conf | 6 +- ...r_galileo_E1_extended_correlator_byte.conf | 6 +- ...galileo_E1_extended_correlator_labsat.conf | 10 +- ...nss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf | 4 +- .../Glonass/gnss-sdr_GLONASS_L1_ibyte.conf | 4 +- .../MultiCons/gnss-sdr_Hybrid_byte.conf | 8 +- .../MultiCons/gnss-sdr_Hybrid_byte_sim.conf | 10 +- .../MultiCons/gnss-sdr_Hybrid_gr_complex.conf | 4 +- .../MultiCons/gnss-sdr_Hybrid_ishort.conf | 6 +- ..._all_in_one_Flexiband_bin_file_III_1b.conf | 10 +- .../gnss-sdr_multisource_Hybrid_ishort.conf | 10 +- .../gnss-sdr_multisource_Hybrid_nsr.conf | 8 +- conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf | 10 +- conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf | 6 +- conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf | 8 +- conf/Other/front-end-cal.conf | 6 +- .../Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf | 4 +- .../gnss-sdr_GPS_L1_nsr_twobit_packed.conf | 8 +- ...-sdr_GPS_L1_pulse_blanking_gr_complex.conf | 4 +- conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf | 6 +- ...gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf | 2 +- .../gnss-sdr_GPS_L1_USRP_X300_realtime.conf | 6 +- .../gnss-sdr_GPS_L1_USRP_realtime.conf | 2 +- .../gnss-sdr_GPS_L1_bladeRF.conf | 2 +- .../gnss-sdr_GPS_L1_fmcomms2_realtime.conf | 4 +- .../gnss-sdr_GPS_L1_rtl_tcp_realtime.conf | 4 +- .../gnss-sdr_GPS_L1_rtlsdr_realtime.conf | 4 +- .../gnss-sdr_GPS_L2C_USRP1_realtime.conf | 6 +- .../gnss-sdr_GPS_L2C_USRP_X300_realtime.conf | 6 +- ...nss-sdr_Galileo_E1_USRP_X300_realtime.conf | 4 +- ...lileo_Beidou_Glonass_L1_USRP_realtime.conf | 6 +- ...GPS_Galileo_Beidou_L1_hackrf_realtime.conf | 4 +- ...ultichannel_GPS_L1_USRP_X300_realtime.conf | 4 +- conf/gnss-sdr.conf | 6 +- docs/CHANGELOG.md | 2 + docs/doxygen/other/main_page.dox | 2 +- ...lileo_e1_pcps_8ms_ambiguous_acquisition.cc | 2 +- ...eo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 2 +- ...e1_pcps_quicksync_ambiguous_acquisition.cc | 2 +- ...ileo_e1_pcps_tong_ambiguous_acquisition.cc | 2 +- ...ileo_e5a_noncoherent_iq_acquisition_caf.cc | 2 +- ...o_e5a_noncoherent_iq_acquisition_caf_cc.cc | 4 +- .../galileo_pcps_8ms_acquisition_cc.cc | 2 +- .../pcps_assisted_acquisition_cc.cc | 2 +- .../pcps_cccwsr_acquisition_cc.cc | 2 +- .../pcps_opencl_acquisition_cc.cc | 4 +- .../pcps_quicksync_acquisition_cc.cc | 2 +- .../pcps_tong_acquisition_cc.cc | 2 +- .../adapters/byte_to_short.cc | 2 +- .../adapters/cshort_to_grcomplex.cc | 2 +- .../adapters/ibyte_to_cbyte.cc | 2 +- .../adapters/ibyte_to_complex.cc | 2 +- .../adapters/ibyte_to_cshort.cc | 2 +- .../adapters/ishort_to_complex.cc | 2 +- .../adapters/ishort_to_cshort.cc | 2 +- .../input_filter/adapters/fir_filter.cc | 2 +- .../adapters/freq_xlating_fir_filter.cc | 2 +- .../adapters/pulse_blanking_filter.cc | 2 +- .../adapters/fifo_signal_source.cc | 2 +- .../adapters/file_source_base.cc | 4 +- .../adapters/file_timestamp_signal_source.cc | 2 +- .../adapters/ion_gsms_signal_source.cc | 2 +- .../spir_gss6450_file_signal_source.cc | 4 +- ...ync_ambiguous_acquisition_gsoc2014_test.cc | 4 +- ...cps_acquisition_gsoc2014_gensource_test.cc | 10 +- .../galileo_e5b_pcps_acquisition_test.cc | 2 +- .../galileo_e6_pcps_acquisition_test.cc | 2 +- ...cps_quicksync_acquisition_gsoc2014_test.cc | 4 +- .../galileo_e1_dll_pll_veml_tracking_test.cc | 2 +- .../tracking/galileo_e5a_tracking_test.cc | 2 +- .../galileo_e5b_dll_pll_tracking_test.cc | 2 +- .../gps_l2_m_dll_pll_tracking_test.cc | 2 +- .../system-parameters/has_decoding_test.cc | 2 +- 91 files changed, 303 insertions(+), 301 deletions(-) diff --git a/README.md b/README.md index 8997686d1..6bad46ab8 100644 --- a/README.md +++ b/README.md @@ -1070,7 +1070,7 @@ You can use a single configuration file for processing different data files, specifying the file to be processed with the `--signal_source` flag: ``` -$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=../data/my_captured_data.dat +$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=./my_captured_data.dat ``` This will override the `SignalSource.filename` specified in the configuration @@ -1455,7 +1455,7 @@ SignalSource.port=1234 SignalSource.swap_iq=false SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ``` Example for a dual-frequency receiver: @@ -1549,7 +1549,7 @@ The block can be configured like this: ;#[Freq_Xlating_Fir_Filter] enables FIR filter and a composite frequency translation that shifts IF down to zero Hz. InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false ; #dump: Dump the filtered data to a file. -InputFilter.dump_filename=../data/input_filter.dat ; #dump_filename: Log path and filename. +InputFilter.dump_filename=./input_filter.dat ; #dump_filename: Log path and filename. InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -1602,7 +1602,7 @@ implements a nearest neighbourhood interpolation: ;#[Pass_Through] disables this block Resampler.implementation=Direct_Resampler Resampler.dump=false ; Dumps the resampled data to a file. -Resampler.dump_filename=../data/resampler.dat ; log path and filename. +Resampler.dump_filename=./resampler.dat ; log path and filename. Resampler.item_type=gr_complex Resampler.sample_freq_in=8000000 ; sample frequency of the input signal Resampler.sample_freq_out=4000000 ; desired sample frequency of the output signal @@ -1830,7 +1830,7 @@ Tracking_1B.dll_filter_order=2 ; DLL loop filter order [1], [2] or [3] Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ``` More documentation at the diff --git a/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf b/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf index a208366e5..32b24bccc 100644 --- a/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf +++ b/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf @@ -39,7 +39,7 @@ Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.dump=false -Acquisition_1C.dump_filename=../data/kalman/acq_dump +Acquisition_1C.dump_filename=./kalman/acq_dump ;######### TRACKING GLOBAL CONFIG ############ Tracking_1C.implementation=GPS_L1_CA_Gaussian_Tracking @@ -48,7 +48,7 @@ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=4.0; Tracking_1C.order=3; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/kalman/epl_tracking_ch_ +Tracking_1C.dump_filename=./kalman/epl_tracking_ch_ Tracking_1C.bce_run = true; Tracking_1C.p_transient = 0; Tracking_1C.s_transient = 100; diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf index d83bd63d3..f0a90781b 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_SPIR.conf @@ -34,7 +34,7 @@ DataTypeAdapter.item_type=float ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=float InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -64,7 +64,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=80000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -107,7 +107,7 @@ Tracking_1C.item_type=gr_complex Tracking_1C.pll_bw_hz=20.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf index 356dde132..6961b3c3f 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_acq_QuickSync.conf @@ -30,14 +30,14 @@ SignalConditioner.implementation=Signal_Conditioner ;######### DATA_TYPE_ADAPTER CONFIG ############ DataTypeAdapter.implementation=Ishort_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/data_type_adapter.dat +DataTypeAdapter.dump_filename=./data_type_adapter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Pass_Through InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -46,7 +46,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf index 84179dbed..d61355a00 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_gr_complex.conf @@ -30,7 +30,7 @@ SignalConditioner.implementation=Signal_Conditioner DataTypeAdapter.implementation=Ishort_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/DataTypeAdapter.dat +DataTypeAdapter.dump_filename=./DataTypeAdapter.dat InputFilter.implementation=Pass_Through InputFilter.input_item_type=gr_complex @@ -67,7 +67,7 @@ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=4.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_c +Tracking_1C.dump_filename=./epl_tracking_c ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf b/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf index 1d76c2a2f..3a90a518d 100644 --- a/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf +++ b/conf/File_input/GPS/gnss-sdr_GPS_L1_ishort.conf @@ -24,7 +24,7 @@ SignalSource.sampling_frequency=4000000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf index d7a72f476..8f3a44652 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf @@ -51,7 +51,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -86,7 +86,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -103,7 +103,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex @@ -153,7 +153,7 @@ Tracking_1C.dll_bw_narrow_hz=2.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf index 48727d42f..a543752ef 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf @@ -50,7 +50,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf index 478cc875d..b86f734d4 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf @@ -51,7 +51,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf index 3ba4ba52d..ac8157f4e 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf @@ -50,7 +50,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf index 73624bc73..f919973d2 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf @@ -50,7 +50,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -85,7 +85,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex @@ -102,7 +102,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf index 9e77cb6ae..746330acf 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf @@ -54,7 +54,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -93,7 +93,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -129,7 +129,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf index f2a47b807..7e494914e 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf @@ -56,7 +56,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -95,7 +95,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -131,7 +131,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex @@ -190,7 +190,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking Tracking_1C.item_type=gr_complex Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=1.5; Tracking_1C.order=3; @@ -215,7 +215,7 @@ Tracking_2S.dll_bw_hz=0.3; Tracking_2S.order=3; Tracking_2S.early_late_space_chips=0.5; Tracking_2S.dump=true -Tracking_2S.dump_filename=../data/epl_tracking_ch_ +Tracking_2S.dump_filename=./epl_tracking_ch_ ;# GALILEO E1B diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf index c6ca7e8e0..7b5609ada 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf @@ -56,7 +56,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter_ch0.dat +InputFilter0.dump_filename=./input_filter_ch0.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -95,7 +95,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -136,7 +136,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Freq_Xlating_Fir_Filter InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter_ch2.dat +InputFilter2.dump_filename=./input_filter_ch2.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex InputFilter2.taps_item_type=float @@ -286,7 +286,7 @@ Tracking_1C.dll_bw_hz=3.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GALILEO E1 TRK CONFIG ############ @@ -298,7 +298,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ diff --git a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf index 0abf4188c..0e0f9f289 100644 --- a/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf +++ b/conf/File_input/GPS/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf @@ -56,7 +56,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter_ch0.dat +InputFilter0.dump_filename=./input_filter_ch0.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -94,7 +94,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -130,7 +130,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Pass_Through InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex @@ -212,7 +212,7 @@ Tracking_1C.dll_bw_hz=3.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf index 1f58776f7..5146a4f1b 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_acq_QuickSync.conf @@ -1,100 +1,100 @@ -; This is a GNSS-SDR configuration file -; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/ -; SPDX-License-Identifier: GPL-3.0-or-later -; SPDX-FileCopyrightText: (C) 2010-2020 (see AUTHORS file for a list of contributors) - -; You can define your own receiver and invoke it by doing -; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf -; - -[GNSS-SDR] - -;######### GLOBAL OPTIONS ################## -;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [samples per second]. -GNSS-SDR.internal_fs_sps=4000000 - - -;######### SIGNAL_SOURCE CONFIG ############ -SignalSource.implementation=File_Signal_Source -SignalSource.filename=/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.samples=0 -SignalSource.repeat=false -SignalSource.enable_throttle_control=false - - -;######### SIGNAL_CONDITIONER CONFIG ############ -SignalConditioner.implementation=Signal_Conditioner - -;######### DATA_TYPE_ADAPTER CONFIG ############ -DataTypeAdapter.implementation=Ishort_To_Complex -DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/data_type_adapter.dat - -;######### INPUT_FILTER CONFIG ############ -InputFilter.implementation=Pass_Through - - -;######### RESAMPLER CONFIG ############ -Resampler.implementation=Pass_Through -Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat -Resampler.item_type=gr_complex - - -;######### CHANNELS GLOBAL CONFIG ############ -Channels_1B.count=4 -Channels.in_acquisition=1 -Channel.signal=1B - - -;######### ACQUISITION GLOBAL CONFIG ############ -Acquisition_1B.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition -Acquisition_1B.item_type=gr_complex -Acquisition_1B.coherent_integration_time_ms=4 -Acquisition_1B.threshold=0.05 -Acquisition_1B.doppler_max=15000 -Acquisition_1B.doppler_step=125 -Acquisition_1B.coherent_integration_time_ms=8 -Acquisition_1B.cboc=false -Acquisition_1B.dump=false -Acquisition_1B.dump_filename=./acq_dump.dat - -;######### TRACKING GLOBAL CONFIG ############ -Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking -Tracking_1B.item_type=gr_complex -Tracking_1B.pll_bw_hz=20.0; -Tracking_1B.dll_bw_hz=2.0; -Tracking_1B.order=3; -Tracking_1B.early_late_space_chips=0.15; -Tracking_1B.very_early_late_space_chips=0.6; -Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ - -;######### TELEMETRY DECODER CONFIG ############ -TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder -TelemetryDecoder_1B.dump=false - -;######### OBSERVABLES CONFIG ############ -Observables.implementation=Hybrid_Observables -Observables.dump=false -Observables.dump_filename=./observables.dat - - -;######### PVT CONFIG ############ -PVT.implementation=RTKLIB_PVT -PVT.positioning_mode=PPP_Static ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic -PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX -PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad -PVT.output_rate_ms=100; -PVT.display_rate_ms=500; -PVT.dump=false -PVT.dump_filename=./PVT -PVT.dump_filename=./PVT -PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea; -PVT.flag_nmea_tty_port=true; -PVT.nmea_dump_devname=/dev/pts/4 -PVT.flag_rtcm_server=false; -PVT.flag_rtcm_tty_port=false; -PVT.rtcm_dump_devname=/dev/pts/1 +; This is a GNSS-SDR configuration file +; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/ +; SPDX-License-Identifier: GPL-3.0-or-later +; SPDX-FileCopyrightText: (C) 2010-2020 (see AUTHORS file for a list of contributors) + +; You can define your own receiver and invoke it by doing +; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf +; + +[GNSS-SDR] + +;######### GLOBAL OPTIONS ################## +;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [samples per second]. +GNSS-SDR.internal_fs_sps=4000000 + + +;######### SIGNAL_SOURCE CONFIG ############ +SignalSource.implementation=File_Signal_Source +SignalSource.filename=/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.samples=0 +SignalSource.repeat=false +SignalSource.enable_throttle_control=false + + +;######### SIGNAL_CONDITIONER CONFIG ############ +SignalConditioner.implementation=Signal_Conditioner + +;######### DATA_TYPE_ADAPTER CONFIG ############ +DataTypeAdapter.implementation=Ishort_To_Complex +DataTypeAdapter.dump=false +DataTypeAdapter.dump_filename=./data_type_adapter.dat + +;######### INPUT_FILTER CONFIG ############ +InputFilter.implementation=Pass_Through + + +;######### RESAMPLER CONFIG ############ +Resampler.implementation=Pass_Through +Resampler.dump=false +Resampler.dump_filename=./resampler.dat +Resampler.item_type=gr_complex + + +;######### CHANNELS GLOBAL CONFIG ############ +Channels_1B.count=4 +Channels.in_acquisition=1 +Channel.signal=1B + + +;######### ACQUISITION GLOBAL CONFIG ############ +Acquisition_1B.implementation=Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition +Acquisition_1B.item_type=gr_complex +Acquisition_1B.coherent_integration_time_ms=4 +Acquisition_1B.threshold=0.05 +Acquisition_1B.doppler_max=15000 +Acquisition_1B.doppler_step=125 +Acquisition_1B.coherent_integration_time_ms=8 +Acquisition_1B.cboc=false +Acquisition_1B.dump=false +Acquisition_1B.dump_filename=./acq_dump.dat + +;######### TRACKING GLOBAL CONFIG ############ +Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking +Tracking_1B.item_type=gr_complex +Tracking_1B.pll_bw_hz=20.0; +Tracking_1B.dll_bw_hz=2.0; +Tracking_1B.order=3; +Tracking_1B.early_late_space_chips=0.15; +Tracking_1B.very_early_late_space_chips=0.6; +Tracking_1B.dump=false +Tracking_1B.dump_filename=./veml_tracking_ch_ + +;######### TELEMETRY DECODER CONFIG ############ +TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder +TelemetryDecoder_1B.dump=false + +;######### OBSERVABLES CONFIG ############ +Observables.implementation=Hybrid_Observables +Observables.dump=false +Observables.dump_filename=./observables.dat + + +;######### PVT CONFIG ############ +PVT.implementation=RTKLIB_PVT +PVT.positioning_mode=PPP_Static ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic +PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX +PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad +PVT.output_rate_ms=100; +PVT.display_rate_ms=500; +PVT.dump=false +PVT.dump_filename=./PVT +PVT.dump_filename=./PVT +PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea; +PVT.flag_nmea_tty_port=true; +PVT.nmea_dump_devname=/dev/pts/4 +PVT.flag_rtcm_server=false; +PVT.flag_rtcm_tty_port=false; +PVT.rtcm_dump_devname=/dev/pts/1 diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf index 257bd9091..2a9fedb8d 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_ishort.conf @@ -41,7 +41,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -75,7 +75,7 @@ Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.track_pilot=true Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf index 883927c8e..0b2dffd9b 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E1_nsr.conf @@ -25,7 +25,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 ; 0 means the entire file SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -62,7 +62,7 @@ InputFilter.sampling_frequency=20480000 InputFilter.IF=5499998.47412109 InputFilter.decimation_factor=8 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -96,7 +96,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf b/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf index 9c2ea55cc..75dd5981a 100644 --- a/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf +++ b/conf/File_input/Galileo/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf @@ -35,7 +35,7 @@ SignalSource.sampling_frequency=50000000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -68,13 +68,13 @@ InputFilter.sampling_frequency=50000000 InputFilter.IF=-15345000 InputFilter.decimation_factor=1 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf index a0715fba8..638a045d6 100644 --- a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf +++ b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_byte.conf @@ -81,7 +81,7 @@ Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 Acquisition_1B.bit_transition_flag=true Acquisition_1B.dump=false -Acquisition_1B.dump_filename=../data/acq_dump.dat +Acquisition_1B.dump_filename=./acq_dump.dat ;######### TRACKING GPS CONFIG ############ @@ -91,7 +91,7 @@ Tracking_1C.pll_bw_hz=30.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -109,7 +109,7 @@ Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.early_late_space_narrow_chips=0.06; Tracking_1B.very_early_late_space_narrow_chips=0.25; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf index 91387a875..cf17d5140 100644 --- a/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf +++ b/conf/File_input/Galileo/gnss-sdr_galileo_E1_extended_correlator_labsat.conf @@ -25,7 +25,7 @@ SignalSource.sampling_frequency=16368000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -39,7 +39,7 @@ DataTypeAdapter.item_type=gr_complex ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex @@ -110,7 +110,7 @@ Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 Acquisition_1B.bit_transition_flag=true Acquisition_1B.dump=false -Acquisition_1B.dump_filename=../data/acq_dump.dat +Acquisition_1B.dump_filename=./acq_dump.dat ;######### TRACKING GPS CONFIG ############ @@ -120,7 +120,7 @@ Tracking_1C.pll_bw_hz=40.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking @@ -137,7 +137,7 @@ Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.early_late_space_narrow_chips=0.15; Tracking_1B.very_early_late_space_narrow_chips=0.30; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf index 021b12ae8..12378e46f 100644 --- a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf +++ b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_CA_GPS_L1_CA_ibyte.conf @@ -11,7 +11,7 @@ GNSS-SDR.num_sources=2 ;######### SIGNAL_SOURCE CONFIG ############ SignalSource0.implementation=File_Signal_Source -SignalSource0.filename=../data/NT1065_L1_20160923_fs6625e6_if60e3_schar.bin ; <- PUT YOUR FILE HERE +SignalSource0.filename=./NT1065_L1_20160923_fs6625e6_if60e3_schar.bin ; <- PUT YOUR FILE HERE SignalSource0.item_type=ibyte SignalSource0.sampling_frequency=6625000 SignalSource0.samples=0 @@ -19,7 +19,7 @@ SignalSource0.dump=false; SignalSource0.dump_filename=/archive/signal_glonass.bin SignalSource1.implementation=File_Signal_Source -SignalSource1.filename=../data/NT1065_GLONASS_L1_20160923_fs6625e6_if0e3_schar.bin ; <- PUT YOUR FILE HERE +SignalSource1.filename=./NT1065_GLONASS_L1_20160923_fs6625e6_if0e3_schar.bin ; <- PUT YOUR FILE HERE SignalSource1.item_type=ibyte SignalSource1.sampling_frequency=6625000 SignalSource1.samples=0 diff --git a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf index 8f8baecfc..254196c30 100644 --- a/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf +++ b/conf/File_input/Glonass/gnss-sdr_GLONASS_L1_ibyte.conf @@ -23,7 +23,7 @@ SignalSource.repeat=false SignalSource.sample_type=iq SignalSource.seconds_to_skip=0 SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -69,7 +69,7 @@ Acquisition_1R.tong_max_dwells=20 Tracking_1R.implementation=GLONASS_L1_CA_DLL_PLL_C_Aid_Tracking Tracking_1R.item_type=cshort Tracking_1R.dump=false -Tracking_1R.dump_filename=../data/epl_tracking_ch_ +Tracking_1R.dump_filename=./epl_tracking_ch_ Tracking_1R.pll_bw_hz=40.0; Tracking_1R.dll_bw_hz=4.0; Tracking_1R.order=3; diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf index 3daee47ce..7e0df6bd2 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte.conf @@ -35,7 +35,7 @@ InputFilter.implementation=Pass_Through InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -44,7 +44,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=20000000 Resampler.sample_freq_out=20000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -113,7 +113,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.dll_bw_narrow_hz=1.5; Tracking_1C.order=2; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -125,7 +125,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf index b92bdc4a9..1360f71bf 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_byte_sim.conf @@ -22,7 +22,7 @@ SignalSource.sampling_frequency=4000000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -32,12 +32,12 @@ SignalConditioner.implementation=Signal_Conditioner ;######### DATA_TYPE_ADAPTER CONFIG ############ DataTypeAdapter.implementation=Ibyte_To_Complex DataTypeAdapter.dump=false -DataTypeAdapter.dump_filename=../data/DataTypeAdapter.dat +DataTypeAdapter.dump_filename=./DataTypeAdapter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Pass_Through InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex @@ -106,14 +106,14 @@ Tracking_1C.order=3; Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking Tracking_1B.item_type=gr_complex Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ Tracking_1B.pll_bw_hz=15.0; Tracking_1B.dll_bw_hz=2.0; Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf index b375cec21..aa404633c 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_gr_complex.conf @@ -85,7 +85,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.dll_bw_narrow_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -98,7 +98,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf b/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf index 3931754e0..c9f0de8f5 100644 --- a/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf +++ b/conf/File_input/MultiCons/gnss-sdr_Hybrid_ishort.conf @@ -56,7 +56,7 @@ InputFilter.output_item_type=gr_complex Resampler.implementation=Pass_Through Resampler.item_type=gr_complex Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -111,7 +111,7 @@ Tracking_1C.pll_bw_hz=50.0; Tracking_1C.dll_bw_hz=5.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -123,7 +123,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf b/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf index a9ec9e564..ebff509e6 100644 --- a/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf +++ b/conf/File_input/MultiCons/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf @@ -57,7 +57,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter_ch0.dat +InputFilter0.dump_filename=./input_filter_ch0.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -96,7 +96,7 @@ DataTypeAdapter1.item_type=gr_complex ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter_ch1.dat +InputFilter1.dump_filename=./input_filter_ch1.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -135,7 +135,7 @@ DataTypeAdapter2.item_type=gr_complex ;######### INPUT_FILTER 2 CONFIG ############ InputFilter2.implementation=Freq_Xlating_Fir_Filter InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter_ch2.dat +InputFilter2.dump_filename=./input_filter_ch2.dat InputFilter2.input_item_type=gr_complex InputFilter2.output_item_type=gr_complex InputFilter2.taps_item_type=float @@ -294,7 +294,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.early_late_space_chips=0.5; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GALILEO E1 TRK CONFIG ############ Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking @@ -305,7 +305,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf index 5838a3b88..04070f0b7 100644 --- a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf +++ b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_ishort.conf @@ -45,7 +45,7 @@ DataTypeAdapter0.implementation=Ishort_To_Complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Pass_Through InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex @@ -54,7 +54,7 @@ InputFilter0.output_item_type=gr_complex ;######### RESAMPLER 1 CONFIG ############ Resampler1.implementation=Pass_Through Resampler1.dump=false -Resampler1.dump_filename=../data/resampler.dat +Resampler1.dump_filename=./resampler.dat Resampler1.item_type=gr_complex Resampler1.sample_freq_in=4000000 Resampler1.sample_freq_out=4000000 @@ -73,7 +73,7 @@ InputFilter1.dump=false ;######### RESAMPLER 1 CONFIG ############ Resampler1.implementation=Pass_Through Resampler1.dump=false -Resampler1.dump_filename=../data/resampler.dat. +Resampler1.dump_filename=./resampler.dat. Resampler1.item_type=gr_complex Resampler1.sample_freq_in=4000000 Resampler1.sample_freq_out=4000000 @@ -126,7 +126,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=4.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -138,7 +138,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf index c5c5e9134..671dd346d 100644 --- a/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf +++ b/conf/File_input/MultiCons/gnss-sdr_multisource_Hybrid_nsr.conf @@ -48,7 +48,7 @@ DataTypeAdapter0.item_type=float ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Freq_Xlating_Fir_Filter InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=float InputFilter0.output_item_type=gr_complex InputFilter0.taps_item_type=float @@ -83,7 +83,7 @@ DataTypeAdapter1.item_type=float ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=float InputFilter1.output_item_type=gr_complex InputFilter1.taps_item_type=float @@ -184,7 +184,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -196,7 +196,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf index d0682aa30..0452136ec 100644 --- a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf +++ b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr.conf @@ -39,7 +39,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -53,7 +53,7 @@ DataTypeAdapter.item_type=float ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=float InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -80,7 +80,7 @@ InputFilter.decimation_factor=8 ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex @@ -120,7 +120,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### GPS L2C GENERIC TRACKING CONFIG ############ Tracking_2S.implementation=GPS_L2_M_DLL_PLL_Tracking @@ -130,7 +130,7 @@ Tracking_2S.dll_bw_hz=0.4; Tracking_2S.order=2; Tracking_2S.early_late_space_chips=0.5; Tracking_2S.dump=true -Tracking_2S.dump_filename=../data/epl_tracking_ch_ +Tracking_2S.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf index a127a5870..ef553d655 100644 --- a/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf +++ b/conf/Nsr_input/gnss-sdr_GPS_L1_nsr_gauss.conf @@ -37,7 +37,7 @@ SignalSource.repeat=false ;#dump: Dump the Signal source data to a file. Disable this option in this version SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;#enable_throttle_control: Enabling this option tells the signal source to keep the delay between samples in post processing. @@ -72,7 +72,7 @@ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false ;#dump_filename: Log path and filename. -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;#The following options are used in the filter design of Fir_Filter and Freq_Xlating_Fir_Filter implementation. ;#These options are based on parameters of gnuradio's function: gr_remez. @@ -169,7 +169,7 @@ Tracking_1C.implementation=GPS_L1_CA_Gaussian_Tracking Tracking_1C.item_type=gr_complex Tracking_1C.if=0 Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ Tracking_1C.pll_bw_hz=15.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; diff --git a/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf b/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf index 91bbc1c69..8e2e10e7b 100644 --- a/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf +++ b/conf/Nsr_input/gnss-sdr_Hybrid_nsr.conf @@ -22,7 +22,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -56,7 +56,7 @@ InputFilter.sampling_frequency=20480000 InputFilter.IF=5499998.47412109 InputFilter.decimation_factor=8 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -129,7 +129,7 @@ Tracking_1C.dll_bw_hz=2.0; Tracking_1C.dll_bw_narrow_hz=1.5; Tracking_1C.order=2; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TRACKING GALILEO CONFIG ############ @@ -141,7 +141,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Other/front-end-cal.conf b/conf/Other/front-end-cal.conf index 39510a009..2753abf6d 100644 --- a/conf/Other/front-end-cal.conf +++ b/conf/Other/front-end-cal.conf @@ -85,7 +85,7 @@ SignalSource.repeat=false ;#dump: Dump the Signal source data to a file. SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ ;## It holds blocks to change data type, filter and resample input data. @@ -102,7 +102,7 @@ DataTypeAdapter.implementation=Pass_Through ;#dump: Dump the filtered data to a file. DataTypeAdapter.dump=false ;#dump_filename: Log path and filename. -DataTypeAdapter.dump_filename=../data/data_type_adapter.dat +DataTypeAdapter.dump_filename=./data_type_adapter.dat ;######### INPUT_FILTER CONFIG ############ ;## Filter the input data. Can be combined with frequency translation for IF signals @@ -176,7 +176,7 @@ InputFilter.decimation_factor=1 InputFilter.dump=false ;#dump_filename: Log path and filename. -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ ;## Resamples the input data. diff --git a/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf b/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf index c1b99441b..f920c7cb6 100644 --- a/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf +++ b/conf/Other/gnss-sdr_GPS_L1_gr_complex_gpu.conf @@ -21,7 +21,7 @@ SignalSource.item_type=gr_complex SignalSource.samples=250000000 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -51,7 +51,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking_GPU Tracking_1C.item_type=gr_complex Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; diff --git a/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf b/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf index 01209aefb..699640977 100644 --- a/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf +++ b/conf/Other/gnss-sdr_GPS_L1_nsr_twobit_packed.conf @@ -54,7 +54,7 @@ SignalSource.sampling_frequency=20480000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -68,7 +68,7 @@ DataTypeAdapter.item_type=float ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=float InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float @@ -94,7 +94,7 @@ InputFilter.decimation_factor=8 ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex @@ -123,7 +123,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf b/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf index b0d592f84..94ab55c7c 100644 --- a/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf +++ b/conf/Other/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf @@ -49,7 +49,7 @@ InputFilter.Pfa=0.001 InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### CHANNELS GLOBAL CONFIG ############ Channels_1C.count=8 @@ -80,7 +80,7 @@ Tracking_1C.dll_bw_narrow_hz=1.5; Tracking_1C.fll_bw_hz=2.0; Tracking_1C.order=3; Tracking_1C.dump=true -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf index 67c4d60e1..efef7d428 100644 --- a/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf +++ b/conf/Other/gnss-sdr_GPS_L1_two_bits_cpx.conf @@ -36,7 +36,7 @@ SignalSource.sampling_frequency=19200000 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_throttle_control=false @@ -70,13 +70,13 @@ InputFilter.sampling_frequency=19200000 InputFilter.IF=4024000 InputFilter.decimation_factor=6 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf index 3fc5c22d2..1b057e4aa 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf @@ -31,7 +31,7 @@ SignalSource.gain_rx2=64 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.enable_dds_lo=false SignalSource.freq_rf_tx_hz=1260000000 SignalSource.freq_dds_tx_hz=1000 diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf index f0ab33656..12c4bd0ee 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_X300_realtime.conf @@ -41,7 +41,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -73,7 +73,7 @@ InputFilter.grid_density=16 InputFilter.sampling_frequency=4000000 InputFilter.IF=0 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ @@ -82,7 +82,7 @@ Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf index 04afb9a6c..e75b568dc 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_USRP_realtime.conf @@ -40,7 +40,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf index e751730de..c2ec58cd6 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_bladeRF.conf @@ -53,7 +53,7 @@ InputFilter.band2_error=1.0 InputFilter.filter_type=bandpass InputFilter.grid_density=16 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf index df763f64e..deef32d6f 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_fmcomms2_realtime.conf @@ -41,7 +41,7 @@ SignalSource.gain_rx1=64 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ SignalConditioner.implementation=Signal_Conditioner @@ -52,7 +52,7 @@ DataTypeAdapter.implementation=Pass_Through ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf index 370931cca..000e2cb18 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf @@ -43,7 +43,7 @@ SignalSource.AGC_enabled = false SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat SignalSource.address=127.0.0.1 SignalSource.port=1234 SignalSource.swap_iq=false @@ -58,7 +58,7 @@ DataTypeAdapter.implementation=Pass_Through ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float diff --git a/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf index 8994bb3f3..149aa8b13 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L1_rtlsdr_realtime.conf @@ -44,7 +44,7 @@ SignalSource.AGC_enabled = false SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;# Please note that the new RTL-SDR Blog V3 dongles ship a < 1 PPM ;# temperature compensated oscillator (TCXO), which is well suited for GNSS @@ -68,7 +68,7 @@ DataTypeAdapter.implementation=Pass_Through ;######### INPUT_FILTER CONFIG ############ InputFilter.implementation=Freq_Xlating_Fir_Filter InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat InputFilter.input_item_type=gr_complex InputFilter.output_item_type=gr_complex InputFilter.taps_item_type=float diff --git a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf index cffb6f9b0..74e1fdbf0 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP1_realtime.conf @@ -39,7 +39,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -73,13 +73,13 @@ InputFilter.sampling_frequency=20000000 InputFilter.IF=-1600000 InputFilter.decimation_factor=1 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex Resampler.sample_freq_in=2000000 Resampler.sample_freq_out=2000000 diff --git a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf index a221b7169..9bf551da0 100644 --- a/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf @@ -42,7 +42,7 @@ SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.repeat=false SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -79,12 +79,12 @@ InputFilter.sampling_frequency=4000000 InputFilter.IF=0 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat Resampler.item_type=gr_complex Resampler.sample_freq_in=4000000 Resampler.sample_freq_out=4000000 diff --git a/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf index b49801d10..fe0ca55d2 100644 --- a/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf @@ -27,7 +27,7 @@ SignalSource.gain=50 SignalSource.subdevice=A:0 SignalSource.samples=0 SignalSource.dump=false -SignalSource.dump_filename=../data/signal_source.dat +SignalSource.dump_filename=./signal_source.dat ;######### SIGNAL_CONDITIONER CONFIG ############ @@ -62,7 +62,7 @@ Tracking_1B.order=3; Tracking_1B.early_late_space_chips=0.15; Tracking_1B.very_early_late_space_chips=0.6; Tracking_1B.dump=false -Tracking_1B.dump_filename=../data/veml_tracking_ch_ +Tracking_1B.dump_filename=./veml_tracking_ch_ ;######### TELEMETRY DECODER CONFIG ############ diff --git a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf index 0c53dedb1..6ed59bd79 100644 --- a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_Glonass_L1_USRP_realtime.conf @@ -54,7 +54,7 @@ InputFilter0.tw=500000 InputFilter0.IF=-22902000 InputFilter0.sampling_frequency=56000000 InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter @@ -68,7 +68,7 @@ InputFilter1.tw=500000 InputFilter1.IF=-8580000 InputFilter1.sampling_frequency=56000000 InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter2.implementation=Freq_Xlating_Fir_Filter @@ -82,7 +82,7 @@ InputFilter2.tw=500000 InputFilter2.IF=18000000 InputFilter2.sampling_frequency=56000000 InputFilter2.dump=false -InputFilter2.dump_filename=../data/input_filter.dat +InputFilter2.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler0.implementation=Pass_Through diff --git a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf index 0844dd1da..05ff16b75 100644 --- a/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_multichannel_GPS_Galileo_Beidou_L1_hackrf_realtime.conf @@ -55,7 +55,7 @@ InputFilter0.tw=1000000 InputFilter0.IF=-6322000 InputFilter0.sampling_frequency=20000000 InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat ;######### INPUT_FILTER CONFIG ############ InputFilter1.implementation=Freq_Xlating_Fir_Filter @@ -70,7 +70,7 @@ InputFilter1.tw=1000000 InputFilter1.IF=8000000 InputFilter1.sampling_frequency=20000000 InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat diff --git a/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf index 61f18e09f..de70827ed 100644 --- a/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf +++ b/conf/RealTime_input/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf @@ -59,7 +59,7 @@ DataTypeAdapter0.item_type=gr_complex ;######### INPUT_FILTER 0 CONFIG ############ InputFilter0.implementation=Pass_Through InputFilter0.dump=false -InputFilter0.dump_filename=../data/input_filter.dat +InputFilter0.dump_filename=./input_filter.dat InputFilter0.input_item_type=gr_complex InputFilter0.output_item_type=gr_complex @@ -74,7 +74,7 @@ SignalConditioner1.implementation=Pass_Through ;######### INPUT_FILTER 1 CONFIG ############ InputFilter1.implementation=Pass_Through InputFilter1.dump=false -InputFilter1.dump_filename=../data/input_filter.dat +InputFilter1.dump_filename=./input_filter.dat InputFilter1.input_item_type=gr_complex InputFilter1.output_item_type=gr_complex diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index 3f4b61766..16cb1e865 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -68,13 +68,13 @@ InputFilter.grid_density=16 InputFilter.sampling_frequency=4000000 InputFilter.IF=0 InputFilter.dump=false -InputFilter.dump_filename=../data/input_filter.dat +InputFilter.dump_filename=./input_filter.dat ;######### RESAMPLER CONFIG ############ Resampler.implementation=Pass_Through Resampler.dump=false -Resampler.dump_filename=../data/resampler.dat +Resampler.dump_filename=./resampler.dat ;######### CHANNELS GLOBAL CONFIG ############ @@ -113,7 +113,7 @@ Tracking_1C.pll_bw_hz=45.0; Tracking_1C.dll_bw_hz=3.0; Tracking_1C.order=3; Tracking_1C.dump=false -Tracking_1C.dump_filename=../data/epl_tracking_ch_ +Tracking_1C.dump_filename=./epl_tracking_ch_ ;######### TELEMETRY DECODER GPS CONFIG ############ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c0932fd6f..320421956 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -121,6 +121,8 @@ All notable changes to GNSS-SDR will be documented in this file. - The empty `build` and `data` folders have been removed. Users can create a building folder using `mkdir build` or by having CMake handle it: `cmake -S . -B build`. + - All default names for dump or input files starting with `../data/` + have been changed to `./`. See the definitions of concepts and metrics at https://gnss-sdr.org/design-forces/ diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox index ab2f2606b..cdb5774ba 100644 --- a/docs/doxygen/other/main_page.dox +++ b/docs/doxygen/other/main_page.dox @@ -212,7 +212,7 @@ and we will be happy to upload it to the server. You can use a single configuration file for processing different data files, specifying the file to be processed with the --signal_source flag: \verbatim -$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=../data/my_captured_data.dat +$ gnss-sdr --config_file=../conf/my_receiver.conf --signal_source=./my_captured_data.dat \endverbatim This will override the SignalSource.filename specified in the configuration file. diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index 903a3748c..1efbcfe4d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -57,7 +57,7 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index 700644227..dab9dcc47 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -48,7 +48,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index cafbcf33b..16a13e02d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -57,7 +57,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index fca12dbfe..27a60b479 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -59,7 +59,7 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index 5fcb2658c..153412bc0 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -66,7 +66,7 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( dump_(configuration_->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/acquisition.dat"); + const std::string default_dump_filename("./acquisition.dat"); item_type_ = configuration_->property(role_ + ".item_type", default_item_type); dump_filename_ = configuration_->property(role_ + ".dump_filename", default_dump_filename); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000); diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index ed095a757..24d8eee4e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -591,7 +591,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items std::stringstream filename; std::streamsize n = sizeof(float) * (d_fft_size); // noncomplex file write filename.str(""); - filename << "../data/test_statistics_E5a_sat_" + filename << "./test_statistics_E5a_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); if (d_sampled_ms > 1) // If integration time > 1 code @@ -694,7 +694,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items std::stringstream filename; std::streamsize n = sizeof(float) * (d_num_doppler_bins); // noncomplex file write filename.str(""); - filename << "../data/test_statistics_E5a_sat_" << d_gnss_synchro->PRN << "_CAF.dat"; + filename << "./test_statistics_E5a_sat_" << d_gnss_synchro->PRN << "_CAF.dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); d_dump_file.write(reinterpret_cast(d_CAF_vector.data()), n); d_dump_file.close(); diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 8bc915769..b5dc2b0ba 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -336,7 +336,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 34eb3d189..91ce7b3d0 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -263,7 +263,7 @@ float pcps_assisted_acquisition_cc::search_maximum() std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << d_gnss_synchro->Acq_doppler_hz << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index ed4ed9ddb..3ad78883c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -352,7 +352,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 5f2fa348c..fbd1b2052 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -429,7 +429,7 @@ void pcps_opencl_acquisition_cc::acquisition_core_volk() std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); @@ -590,7 +590,7 @@ void pcps_opencl_acquisition_cc::acquisition_core_opencl() std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index fdd6d918a..d54b8085a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -436,7 +436,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index 42c131337..75f8325d5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -342,7 +342,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items, std::stringstream filename; std::streamsize n = 2 * sizeof(float) * (d_fft_size); // complex file write filename.str(""); - filename << "../data/test_statistics_" << d_gnss_synchro->System + filename << "./test_statistics_" << d_gnss_synchro->System << "_" << d_gnss_synchro->Signal[0] << d_gnss_synchro->Signal[1] << "_sat_" << d_gnss_synchro->PRN << "_doppler_" << doppler << ".dat"; d_dump_file.open(filename.str().c_str(), std::ios::out | std::ios::binary); diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc index afb062772..b853cebc1 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -35,7 +35,7 @@ ByteToShort::ByteToShort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("short"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc b/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc index 7eb94a519..ad63835ce 100644 --- a/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc +++ b/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc @@ -32,7 +32,7 @@ CshortToGrComplex::CshortToGrComplex(const ConfigurationInterface* configuration out_streams_(out_streams), dump_(configuration->property(role_ + ".dump", false)) { - const std::string default_dump_filename("../data/data_type_adapter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc index 835ec2021..a675a57d5 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -37,7 +37,7 @@ IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("lv_8sc_t"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc index a79458e5b..7df423095 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -34,7 +34,7 @@ IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, cons { const std::string default_input_item_type("byte"); const std::string default_output_item_type("gr_complex"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc index 2420bcd0f..94dbd8afe 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -36,7 +36,7 @@ IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("cshort"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc index 18d8df571..9a86a2a2f 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -34,7 +34,7 @@ IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, { const std::string default_input_item_type("short"); const std::string default_output_item_type("gr_complex"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc index 80e1c680a..9f5f546ca 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -36,7 +36,7 @@ IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("short"); const std::string default_output_item_type("cshort"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index 12cef24ca..92c84645a 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -142,7 +142,7 @@ void FirFilter::init() const std::string default_input_item_type("gr_complex"); const std::string default_output_item_type("gr_complex"); const std::string default_taps_item_type("float"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); const std::string default_filter_type("bandpass"); const std::vector default_bands = {0.0, 0.4, 0.6, 1.0}; const std::vector default_ampl = {1.0, 1.0, 0.0, 0.0}; diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index 1378931c8..ba75c6f67 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -41,7 +41,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu const std::string default_input_item_type("gr_complex"); const std::string default_output_item_type("gr_complex"); const std::string default_taps_item_type("float"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); const double default_intermediate_freq = 0.0; const double default_sampling_freq = 4000000.0; const int default_number_of_taps = 6; diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index 8971d2c9d..8732ba4f8 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -39,7 +39,7 @@ PulseBlankingFilter::PulseBlankingFilter(const ConfigurationInterface* configura out_streams_(out_streams) { const std::string default_item_type("gr_complex"); - const std::string default_dump_filename("../data/input_filter.dat"); + const std::string default_dump_filename("./input_filter.dat"); const float default_pfa_ = 0.04; const float pfa = configuration->property(role_ + ".pfa", default_pfa_); const int default_length_ = 32; diff --git a/src/algorithms/signal_source/adapters/fifo_signal_source.cc b/src/algorithms/signal_source/adapters/fifo_signal_source.cc index c4f0fd08b..1064166db 100644 --- a/src/algorithms/signal_source/adapters/fifo_signal_source.cc +++ b/src/algorithms/signal_source/adapters/fifo_signal_source.cc @@ -35,7 +35,7 @@ FifoSignalSource::FifoSignalSource(ConfigurationInterface const* configuration, [[maybe_unused]] Concurrent_Queue* queue) : SignalSourceBase(configuration, role, "Fifo_Signal_Source"s), item_size_(sizeof(gr_complex)), // currenty output item size is always gr_complex - fifo_reader_(FifoReader::make(configuration->property(role + ".filename", "../data/example_capture.dat"s), + fifo_reader_(FifoReader::make(configuration->property(role + ".filename", "./example_capture.dat"s), configuration->property(role + ".sample_type", "ishort"s))), dump_(configuration->property(role + ".dump", false)), dump_filename_(configuration->property(role + ".dump_filename", "./data/signal_source.dat"s)) diff --git a/src/algorithms/signal_source/adapters/file_source_base.cc b/src/algorithms/signal_source/adapters/file_source_base.cc index 7b9efcbc2..aabef306b 100644 --- a/src/algorithms/signal_source/adapters/file_source_base.cc +++ b/src/algorithms/signal_source/adapters/file_source_base.cc @@ -48,8 +48,8 @@ FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std: : SignalSourceBase(configuration, role, std::move(impl)), queue_(queue), role_(role), - filename_(configuration->property(role_ + ".filename"s, "../data/example_capture.dat"s)), - dump_filename_(configuration->property(role_ + ".dump_filename"s, "../data/my_capture.dat"s)), + filename_(configuration->property(role_ + ".filename"s, "./example_capture.dat"s)), + dump_filename_(configuration->property(role_ + ".dump_filename"s, "./my_capture.dat"s)), item_type_(configuration->property(role_ + ".item_type"s, std::move(default_item_type))), item_size_(0), header_size_(configuration->property(role_ + ".header_size"s, uint64_t(0))), diff --git a/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc b/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc index 92788ee02..0286c6ea3 100644 --- a/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_timestamp_signal_source.cc @@ -34,7 +34,7 @@ FileTimestampSignalSource::FileTimestampSignalSource(const ConfigurationInterfac unsigned int out_streams, Concurrent_Queue* queue) : FileSourceBase(configuration, role, "File_Timestamp_Signal_Source"s, queue, "byte"s), - timestamp_file_(configuration->property(role + ".timestamp_filename"s, "../data/example_capture_timestamp.dat"s)), + timestamp_file_(configuration->property(role + ".timestamp_filename"s, "./example_capture_timestamp.dat"s)), timestamp_clock_offset_ms_(configuration->property(role + ".timestamp_clock_offset_ms"s, 0.0)) { if (in_streams > 0) diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc index 00f2be229..c92c35433 100644 --- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc +++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc @@ -61,7 +61,7 @@ IONGSMSSignalSource::IONGSMSSignalSource(const ConfigurationInterface* configura Concurrent_Queue* queue) : SignalSourceBase(configuration, role, "ION_GSMS_Signal_Source"s), stream_ids_(parse_comma_list(configuration->property(role + ".streams"s, ""s))), - metadata_filepath_(configuration->property(role + ".metadata_filename"s, "../data/example_capture_metadata.sdrx"s)), + metadata_filepath_(configuration->property(role + ".metadata_filename"s, "./example_capture_metadata.sdrx"s)), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc index a9b503c14..1b29d773e 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc @@ -54,8 +54,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInte enable_throttle_control_(configuration->property(role + ".enable_throttle_control", false)), endian_swap_(configuration->property(role + ".endian", false)) { - const std::string default_filename("../data/my_capture.dat"); - const std::string default_dump_filename("../data/my_capture_dump.dat"); + const std::string default_filename("./my_capture.dat"); + const std::string default_dump_filename("./my_capture_dump.dat"); filename_ = configuration->property(role + ".filename", default_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index 0a893e41c..ad56e7403 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -882,7 +882,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul { std::stringstream filenamepd; filenamepd.str(""); - filenamepd << "../data/test_statistics_" << gnss_synchro.System + filenamepd << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_e1_value_CN0_dB_0 << "_dBHz.csv"; @@ -908,7 +908,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul { std::stringstream filenamepf; filenamepf.str(""); - filenamepf << "../data/test_statistics_" << gnss_synchro.System + filenamepf << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_e1_value_CN0_dB_0 << "_dBHz.csv"; diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 33d60383e..ae1224f8f 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -243,7 +243,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_1() config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); @@ -277,7 +277,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_1() config->set_property("Acquisition_5X.doppler_step", "250"); config->set_property("Acquisition_5X.bit_transition_flag", "false"); config->set_property("Acquisition_5X.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/acquisition.dat"); + config->set_property("SignalSource.dump_filename", "./acquisition.dat"); } @@ -313,7 +313,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_2() config->set_property("Acquisition_5X.doppler_step", "250"); config->set_property("Acquisition_5X.bit_transition_flag", "false"); config->set_property("Acquisition_5X.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/acquisition.dat"); + config->set_property("SignalSource.dump_filename", "./acquisition.dat"); } @@ -393,7 +393,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_3() config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); @@ -424,7 +424,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_3() config->set_property("Acquisition_5X.doppler_step", "250"); config->set_property("Acquisition_5X.bit_transition_flag", "false"); config->set_property("Acquisition_5X.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/acquisition.dat"); + config->set_property("SignalSource.dump_filename", "./acquisition.dat"); } diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index c74b99d29..4ac65eeb8 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -200,7 +200,7 @@ void GalileoE5bPcpsAcquisitionTest::init() config->set_property("SignalSource.data_flag", "false"); config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); config->set_property("InputFilter.output_item_type", "gr_complex"); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc index 497ced58f..07bc29ca1 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc @@ -200,7 +200,7 @@ void GalileoE6PcpsAcquisitionTest::init() config->set_property("SignalSource.data_flag", "false"); config->set_property("SignalSource.BW_BB", "0.97"); config->set_property("SignalSource.dump", "false"); - config->set_property("SignalSource.dump_filename", "../data/signal_source.dat"); + config->set_property("SignalSource.dump_filename", "./signal_source.dat"); config->set_property("InputFilter.implementation", "Fir_Filter"); config->set_property("InputFilter.input_item_type", "gr_complex"); config->set_property("InputFilter.output_item_type", "gr_complex"); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 1dce2a6f8..e2fd892a4 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -849,7 +849,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili { std::stringstream filenamepd; filenamepd.str(""); - filenamepd << "../data/test_statistics_" << gnss_synchro.System + filenamepd << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_value_CN0_dB_0 << "_dBHz.csv"; @@ -876,7 +876,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili { std::stringstream filenamepf; filenamepf.str(""); - filenamepf << "../data/test_statistics_" << gnss_synchro.System + filenamepf << "./test_statistics_" << gnss_synchro.System << "_" << gnss_synchro.Signal << "_sat_" #if USE_GLOG_AND_GFLAGS << gnss_synchro.PRN << "CN0_dB_0_" << FLAGS_value_CN0_dB_0 << "_dBHz.csv"; diff --git a/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc index b5b92999b..bd4e74d7e 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc @@ -72,7 +72,7 @@ void GalileoE1DllPllVemlTrackingInternalTest::init() config->set_property("Tracking_1B.implementation", "Galileo_E1_DLL_PLL_VEML_Tracking"); config->set_property("Tracking_1B.item_type", "gr_complex"); config->set_property("Tracking_1B.dump", "false"); - config->set_property("Tracking_1B.dump_filename", "../data/veml_tracking_ch_"); + config->set_property("Tracking_1B.dump_filename", "./veml_tracking_ch_"); config->set_property("Tracking_1B.early_late_space_chips", "0.15"); config->set_property("Tracking_1B.very_early_late_space_chips", "0.6"); config->set_property("Tracking_1B.pll_bw_hz", "30.0"); diff --git a/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc index 9d17f703a..f13a498bd 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc @@ -78,7 +78,7 @@ void GalileoE5aTrackingTest::init() config->set_property("Tracking_5X.implementation", "Galileo_E5a_DLL_PLL_Tracking"); config->set_property("Tracking_5X.item_type", "gr_complex"); config->set_property("Tracking_5X.dump", "false"); - config->set_property("Tracking_5X.dump_filename", "../data/e5a_tracking_ch_"); + config->set_property("Tracking_5X.dump_filename", "./e5a_tracking_ch_"); config->set_property("Tracking_5X.early_late_space_chips", "0.5"); config->set_property("Tracking_5X.order", "2"); config->set_property("Tracking_5X.pll_bw_hz", "20.0"); diff --git a/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc index 4e69dae2a..8536ece4f 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5b_dll_pll_tracking_test.cc @@ -79,7 +79,7 @@ void GalileoE5bTrackingTest::init() config->set_property("Tracking_7X.implementation", "Galileo_E5b_DLL_PLL_Tracking"); config->set_property("Tracking_7X.item_type", "gr_complex"); config->set_property("Tracking_7X.dump", "false"); - config->set_property("Tracking_7X.dump_filename", "../data/e5b_tracking"); + config->set_property("Tracking_7X.dump_filename", "./e5b_tracking"); config->set_property("Tracking_7X.early_late_space_chips", "0.5"); config->set_property("Tracking_7X.order", "2"); config->set_property("Tracking_7X.pll_bw_hz", "20.0"); diff --git a/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc index 43c32314a..995ce58dd 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc @@ -144,7 +144,7 @@ void GpsL2MDllPllTrackingTest::init() config->set_property("GNSS-SDR.internal_fs_sps", "5000000"); config->set_property("Tracking_2S.item_type", "gr_complex"); config->set_property("Tracking_2S.dump", "false"); - config->set_property("Tracking_2S.dump_filename", "../data/L2m_tracking_ch_"); + config->set_property("Tracking_2S.dump_filename", "./L2m_tracking_ch_"); config->set_property("Tracking_2S.implementation", "GPS_L2_M_DLL_PLL_Tracking"); config->set_property("Tracking_2S.early_late_space_chips", "0.5"); config->set_property("Tracking_2S.order", "2"); diff --git a/tests/unit-tests/system-parameters/has_decoding_test.cc b/tests/unit-tests/system-parameters/has_decoding_test.cc index 5dc12536f..a93b07da2 100644 --- a/tests/unit-tests/system-parameters/has_decoding_test.cc +++ b/tests/unit-tests/system-parameters/has_decoding_test.cc @@ -33,7 +33,7 @@ // Usage: // ./run_tests --gtest_filter=HAS_Test.Decoder -// ./run_tests --gtest_filter=HAS_Test.Decoder --has_data_test_file=../data/HAS_Messages_sample/encoded/Sample_HAS_Pages_Encoded_20210713_08.txt --start_page_test_file=70 +// ./run_tests --gtest_filter=HAS_Test.Decoder --has_data_test_file=./HAS_Messages_sample/encoded/Sample_HAS_Pages_Encoded_20210713_08.txt --start_page_test_file=70 #if USE_GLOG_AND_GFLAGS DEFINE_string(has_data_test_file, std::string(""), "File containing encoded HAS pages (format: [time sat_id HAS_page_in_hex] in each line)"); From 15e052030b17664d138771d9e83bafb2824e218f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 5 Oct 2024 09:00:03 +0200 Subject: [PATCH 03/14] Remove tests leftovers --- ...leo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 2 +- .../acquisition/galileo_e5b_pcps_acquisition_test.cc | 2 +- .../acquisition/galileo_e6_pcps_acquisition_test.cc | 2 +- .../gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index ad56e7403..7614c7dfd 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -306,7 +306,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_2() /*Unset this flag to eliminates data logging for the Validation of results probabilities test*/ - dump_test_results = true; + dump_test_results = false; num_of_realizations = 100; diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index 4ac65eeb8..34f0c1de0 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -222,7 +222,7 @@ void GalileoE5bPcpsAcquisitionTest::init() config->set_property("Acquisition_7X.implementation", "Galileo_E5b_PCPS_Acquisition"); config->set_property("Acquisition_7X.item_type", "gr_complex"); config->set_property("Acquisition_7X.coherent_integration_time_ms", std::to_string(integration_time_ms)); - config->set_property("Acquisition_7X.dump", "true"); + config->set_property("Acquisition_7X.dump", "false"); config->set_property("Acquisition_7X.dump_filename", "./acquisition"); config->set_property("Acquisition_7X.threshold", "0.001"); config->set_property("Acquisition_7X.doppler_max", "10000"); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc index 07bc29ca1..8f433b5d2 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc @@ -222,7 +222,7 @@ void GalileoE6PcpsAcquisitionTest::init() config->set_property("Acquisition_E6.implementation", "Galileo_E6_PCPS_Acquisition"); config->set_property("Acquisition_E6.item_type", "gr_complex"); config->set_property("Acquisition_E6.coherent_integration_time_ms", std::to_string(integration_time_ms)); - config->set_property("Acquisition_E6.dump", "true"); + config->set_property("Acquisition_E6.dump", "false"); config->set_property("Acquisition_E6.dump_filename", "./acquisition"); config->set_property("Acquisition_E6.pfa", "0.01"); config->set_property("Acquisition_E6.doppler_max", "10000"); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index e2fd892a4..d3d12b6a1 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -396,7 +396,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::config_3() /*Unset this flag to eliminates data logging for the Validation of results probabilities test*/ - dump_test_results = true; + dump_test_results = false; num_of_realizations = 1; From 5108f0aa60ac654cf2d20fc1780ca73f606d4336 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 6 Oct 2024 07:52:26 +0200 Subject: [PATCH 04/14] Avoid building failure if the user forgot -DENABLE_FPGA=ON when it was required --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c933e908..7535b5c2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3268,10 +3268,15 @@ if(ENABLE_AD9361 OR ENABLE_FMCOMMS2 OR ENABLE_PLUTOSDR) else() message(FATAL_ERROR "libiio is required for building gnss-sdr with -DENABLE_AD9361=ON.") endif() + else() + if(ENABLE_AD9361) + set(ENABLE_FPGA ON) + endif() endif() endif() + ################################################################################ # ION GNSS-SDR Metadata Standard https://sdr.ion.org/ (OPTIONAL) ################################################################################ @@ -3327,6 +3332,7 @@ if(ENABLE_ION) endif() + ##################################################################### # Check signal sources related to FPGA only. ##################################################################### @@ -3368,6 +3374,7 @@ if(ENABLE_MAX2771) file(GLOB_RECURSE SPIDEV_FILE "${TARGET_ROOTFS_PATH}/*/spidev.h") if(EXISTS "${SPIDEV_FILE}") message(STATUS "SPIdev driver found: ${SPIDEV_FILE}") + set(ENABLE_FPGA ON) else() message(STATUS "SPIdev driver not found, its installation is required.") if(ENABLE_PACKAGING) @@ -3399,6 +3406,7 @@ if(ENABLE_DMA_PROXY) file(GLOB_RECURSE DMA_PROXY_FILE "${TARGET_ROOTFS_PATH}/*/dma-proxy.ko") if(EXISTS "${DMA_PROXY_FILE}") message(STATUS "Found dma-proxy.ko file: ${DMA_PROXY_FILE}") + set(ENABLE_FPGA ON) else() if(ENABLE_PACKAGING) set(ENABLE_DMA_PROXY OFF) From 0a0154e1af08b35349e4cfd4da8c77e3d7099222 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 6 Oct 2024 08:14:46 +0200 Subject: [PATCH 05/14] Fix warnings when building benchmarks --- tests/benchmarks/CMakeLists.txt | 2 +- tests/benchmarks/benchmark_detector.cc | 30 +++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt index 31ebf9f82..7d94d9e9b 100644 --- a/tests/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt @@ -112,7 +112,7 @@ endif() add_benchmark(benchmark_atan2 Gnuradio::runtime) add_benchmark(benchmark_copy) add_benchmark(benchmark_crypto core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES}) -add_benchmark(benchmark_osnma core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES}) +# add_benchmark(benchmark_osnma core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES}) add_benchmark(benchmark_detector core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES}) add_benchmark(benchmark_preamble core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES}) add_benchmark(benchmark_reed_solomon core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES}) diff --git a/tests/benchmarks/benchmark_detector.cc b/tests/benchmarks/benchmark_detector.cc index 5679e9c3b..61da0f70c 100644 --- a/tests/benchmarks/benchmark_detector.cc +++ b/tests/benchmarks/benchmark_detector.cc @@ -42,9 +42,9 @@ void bm_forloop(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; for (size_t i = 0; i < d_preamble_samples.size(); i++) { if (d_symbol_history[i] < 0.0) @@ -57,6 +57,10 @@ void bm_forloop(benchmark::State& state) } } } + if (corr_value) + { + // avoidl warning + }; } @@ -73,14 +77,18 @@ void bm_accumulate(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::accumulate(d_symbol_history.begin(), d_symbol_history.end(), 0, [&d_preamble_samples, n = 0](float a, float b) mutable { return (b > 0.0 ? a + d_preamble_samples[n++] : a - d_preamble_samples[n++]); }); } + if (corr_value) + { + // avoidl warning + }; } @@ -97,9 +105,9 @@ void bm_inner_product(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::inner_product(d_symbol_history.begin(), d_symbol_history.end(), d_preamble_samples.begin(), @@ -111,6 +119,10 @@ void bm_inner_product(benchmark::State& state) #endif [](float a, int32_t b) { return (std::signbit(a) ? -b : b); }); } + if (corr_value) + { + // avoidl warning + }; } @@ -128,9 +140,9 @@ void bm_transform_reduce(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::transform_reduce(d_symbol_history.begin(), d_symbol_history.end(), d_preamble_samples.begin(), @@ -138,6 +150,10 @@ void bm_transform_reduce(benchmark::State& state) std::plus<>(), [](auto a, auto b) { return (std::signbit(a) ? -b : b); }); } + if (corr_value) + { + // avoidl warning + }; } #endif @@ -156,9 +172,9 @@ void bm_transform_reduce_policy(benchmark::State& state) std::generate(d_preamble_samples.begin(), d_preamble_samples.end(), [n = 0]() mutable { return (GPS_CA_PREAMBLE_SYMBOLS_STR[n++] == '1' ? 1 : -1); }); + int32_t corr_value = 0; while (state.KeepRunning()) { - int32_t corr_value = 0; corr_value += std::transform_reduce( std::execution::par, d_symbol_history.begin(), @@ -168,6 +184,10 @@ void bm_transform_reduce_policy(benchmark::State& state) std::plus<>(), [](auto a, auto b) { return (std::signbit(a) ? -b : b); }); } + if (corr_value) + { + // avoidl warning + }; } #endif From a5c792f689c88a40dfaf0541c7358db6e9868aa8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 7 Oct 2024 15:05:32 +0200 Subject: [PATCH 06/14] Workaround for Clang 18 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7535b5c2a..b5bd2ee95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1493,6 +1493,12 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.24 endif() endif() +# Workaround for Clang 18 +if(absl_FOUND AND absl_VERSION AND ("${absl_VERSION}" VERSION_LESS "20240722")) + if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "17.99")) + add_compile_options(-fclang-abi-compat=17) + endif() +endif() if(NOT absl_FOUND) set(ENABLE_GLOG_AND_GFLAGS ON) From 4c07b71c37008b11a74b3fc302757abd832d2eb3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 7 Oct 2024 17:40:16 +0200 Subject: [PATCH 07/14] Storage-class specifier should be at the beginning of the declaration --- src/core/system_parameters/osnma_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/system_parameters/osnma_data.h b/src/core/system_parameters/osnma_data.h index 7e6d03b42..c071c1994 100644 --- a/src/core/system_parameters/osnma_data.h +++ b/src/core/system_parameters/osnma_data.h @@ -229,7 +229,7 @@ public: { } const uint32_t tag_id; - uint32_t static id_counter; + static uint32_t id_counter; uint32_t TOW; uint32_t WN; uint32_t PRNa; From 506d2eefe18a9504a5b1cfd0e4586b799c6adf0b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 7 Oct 2024 17:58:37 +0200 Subject: [PATCH 08/14] Fix for cpplint 2.0 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ddb7cbc68..0237db215 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -167,8 +167,8 @@ jobs: run: sudo apt-get install python3-pip && sudo pip3 install cpplint - name: run checks run: "find ./src/ ./utils ./tests -iname *.h -o -iname *.cc | xargs cpplint - --filter=-,+build/class,+build/c++14,+build/deprecated,+build/explicit_make_pair,\ - +build/include_what_you_use,+build/printf_format,+build/storage_class,\ + --filter=-,+build/class,+build/c++17,+build/deprecated,+build/explicit_make_pair,\ + +build/printf_format,+build/storage_class,\ +readability/constructors,+readability/namespace,+readability/newline,\ +readability/utf8,+runtime/casting,+runtime/explicit,\ +runtime/indentation_namespace,+runtime/init,+runtime/invalid_increment,\ From ef4bf2cf4f5c44b462ec343bee667850dd56e45d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 7 Oct 2024 18:59:55 +0200 Subject: [PATCH 09/14] Fix for cpplint 2.0 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0237db215..a581109c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -167,8 +167,8 @@ jobs: run: sudo apt-get install python3-pip && sudo pip3 install cpplint - name: run checks run: "find ./src/ ./utils ./tests -iname *.h -o -iname *.cc | xargs cpplint - --filter=-,+build/class,+build/c++17,+build/deprecated,+build/explicit_make_pair,\ - +build/printf_format,+build/storage_class,\ + --filter=-,+build/class,+build/deprecated,+build/explicit_make_pair,\ + +build/forward_decl,+build/printf_format,+build/storage_class,\ +readability/constructors,+readability/namespace,+readability/newline,\ +readability/utf8,+runtime/casting,+runtime/explicit,\ +runtime/indentation_namespace,+runtime/init,+runtime/invalid_increment,\ From 601b2ee6f2c4e107470cd38abc11ed069ea583b4 Mon Sep 17 00:00:00 2001 From: Marc Majoral Date: Thu, 10 Oct 2024 11:42:19 +0200 Subject: [PATCH 10/14] Make zero padding optional in acquisition when using the FPGA --- .../galileo_e1_pcps_ambiguous_acquisition_fpga.cc | 13 +++++-------- .../adapters/galileo_e5a_pcps_acquisition_fpga.cc | 12 +++++------- .../adapters/galileo_e5b_pcps_acquisition_fpga.cc | 12 +++++------- .../adapters/gps_l1_ca_pcps_acquisition_fpga.cc | 12 +++++------- .../adapters/gps_l2_m_pcps_acquisition_fpga.cc | 11 ++++++++--- .../adapters/gps_l5i_pcps_acquisition_fpga.cc | 13 ++++++------- src/algorithms/acquisition/libs/acq_conf_fpga.cc | 6 ++++-- src/algorithms/acquisition/libs/acq_conf_fpga.h | 1 + 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc index 900e7ac91..1610bb3c5 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc @@ -81,7 +81,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( int32_t tmp2; int32_t local_code; int32_t fft_data; - for (uint32_t PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++) { bool cboc = false; // cboc is set to 0 when using the FPGA @@ -100,16 +99,14 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( cboc, PRN, fs_in_, 0, false); } - for (uint32_t s = code_length; s < 2 * code_length; s++) + if (acq_parameters_.enable_zero_padding) { - code[s] = code[s - code_length]; + // Duplicate the code sequence + std::copy(code.begin(), code.begin() + code_length, code.begin() + code_length); } - // fill in zero padding - for (uint32_t s = 2 * code_length; s < nsamples_total; s++) - { - code[s] = std::complex(0.0, 0.0); - } + // Fill in zero padding for the rest + std::fill(code.begin() + (acq_parameters_.enable_zero_padding ? 2 * code_length : code_length), code.end(), std::complex(0.0, 0.0)); std::copy_n(code.data(), nsamples_total, fft_if->get_inbuf()); // copy to FFT buffer fft_if->execute(); // Run the FFT of local code diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index 98e8bcf3c..0fa8a554a 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -107,16 +107,14 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga( galileo_e5_a_code_gen_complex_sampled(code, PRN, signal_, fs_in_, 0); - for (uint32_t s = code_length; s < 2 * code_length; s++) + if (acq_parameters_.enable_zero_padding) { - code[s] = code[s - code_length]; + // Duplicate the code sequence + std::copy(code.begin(), code.begin() + code_length, code.begin() + code_length); } - // fill in zero padding - for (uint32_t s = 2 * code_length; s < nsamples_total; s++) - { - code[s] = std::complex(0.0, 0.0); - } + // Fill in zero padding for the rest + std::fill(code.begin() + (acq_parameters_.enable_zero_padding ? 2 * code_length : code_length), code.end(), std::complex(0.0, 0.0)); std::copy_n(code.data(), nsamples_total, fft_if->get_inbuf()); // copy to FFT buffer fft_if->execute(); // Run the FFT of local code diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc index f7a303f2d..295ba4f23 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc @@ -106,16 +106,14 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration galileo_e5_b_code_gen_complex_sampled(code, PRN, signal_, fs_in_, 0); - for (uint32_t s = code_length; s < 2 * code_length; s++) + if (acq_parameters_.enable_zero_padding) { - code[s] = code[s - code_length]; + // Duplicate the code sequence + std::copy(code.begin(), code.begin() + code_length, code.begin() + code_length); } - // fill in zero padding - for (uint32_t s = 2 * code_length; s < nsamples_total; s++) - { - code[s] = std::complex(0.0, 0.0); - } + // Fill in zero padding for the rest + std::fill(code.begin() + (acq_parameters_.enable_zero_padding ? 2 * code_length : code_length), code.end(), std::complex(0.0, 0.0)); std::copy_n(code.data(), nsamples_total, fft_if->get_inbuf()); // copy to FFT buffer fft_if->execute(); // Run the FFT of local code diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc index 0242062b0..892f2de6a 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc @@ -87,16 +87,14 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( { gps_l1_ca_code_gen_complex_sampled(code, PRN, fs_in_, 0); // generate PRN code - for (uint32_t s = code_length; s < 2 * code_length; s++) + if (acq_parameters_.enable_zero_padding) { - code[s] = code[s - code_length]; + // Duplicate the code sequence + std::copy(code.begin(), code.begin() + code_length, code.begin() + code_length); } - // fill in zero padding - for (uint32_t s = 2 * code_length; s < nsamples_total; s++) - { - code[s] = std::complex(0.0, 0.0); - } + // Fill in zero padding for the rest + std::fill(code.begin() + (acq_parameters_.enable_zero_padding ? 2 * code_length : code_length), code.end(), std::complex(0.0, 0.0)); std::copy_n(code.data(), nsamples_total, fft_if->get_inbuf()); // copy to FFT buffer fft_if->execute(); // Run the FFT of local code diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc index e78b1b174..5d7662c59 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc @@ -87,11 +87,16 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( for (unsigned int PRN = 1; PRN <= NUM_PRNs; PRN++) { gps_l2c_m_code_gen_complex_sampled(code, PRN, fs_in_); - // fill in zero padding - for (unsigned int s = code_length; s < nsamples_total; s++) + + if (acq_parameters_.enable_zero_padding) { - code[s] = std::complex(0.0, 0.0); + // Duplicate the code sequence + std::copy(code.begin(), code.begin() + code_length, code.begin() + code_length); } + + // Fill in zero padding for the rest + std::fill(code.begin() + (acq_parameters_.enable_zero_padding ? 2 * code_length : code_length), code.end(), std::complex(0.0, 0.0)); + std::copy_n(code.data(), nsamples_total, fft_if->get_inbuf()); // copy to FFT buffer fft_if->execute(); // Run the FFT of local code volk_32fc_conjugate_32fc(fft_codes_padded.data(), fft_if->get_outbuf(), nsamples_total); // conjugate values diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc index 0e379d034..924034987 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc @@ -88,16 +88,15 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( { gps_l5i_code_gen_complex_sampled(code, PRN, fs_in_); - for (uint32_t s = code_length; s < 2 * code_length; s++) + if (acq_parameters_.enable_zero_padding) { - code[s] = code[s - code_length]; + // Duplicate the code sequence + std::copy(code.begin(), code.begin() + code_length, code.begin() + code_length); } - for (uint32_t s = 2 * code_length; s < nsamples_total; s++) - { - // fill in zero padding - code[s] = std::complex(0.0, 0.0); - } + // Fill in zero padding for the rest + std::fill(code.begin() + (acq_parameters_.enable_zero_padding ? 2 * code_length : code_length), code.end(), std::complex(0.0, 0.0)); + std::copy_n(code.data(), nsamples_total, fft_if->get_inbuf()); // copy to FFT buffer fft_if->execute(); // Run the FFT of local code volk_32fc_conjugate_32fc(fft_codes_padded.data(), fft_if->get_outbuf(), nsamples_total); // conjugate values diff --git a/src/algorithms/acquisition/libs/acq_conf_fpga.cc b/src/algorithms/acquisition/libs/acq_conf_fpga.cc index 00e47b153..79f02b477 100644 --- a/src/algorithms/acquisition/libs/acq_conf_fpga.cc +++ b/src/algorithms/acquisition/libs/acq_conf_fpga.cc @@ -46,9 +46,11 @@ void Acq_Conf_Fpga::SetFromConfiguration(const ConfigurationInterface *configura // code length in samples code_length = static_cast(std::round(static_cast(fs_in) / (chip_rate / code_length_chips))); + enable_zero_padding = configuration->property(role + ".enable_zero_padding", true); + // The FPGA can only use FFT lengths that are a power of two. - float nbits = ceilf(log2f(static_cast(code_length) * 2.0F)); - samples_per_code = pow(2, nbits); + float factor = enable_zero_padding ? 2.0F : 1.0F; + samples_per_code = pow(2, ceilf(log2f(static_cast(code_length) * factor))); // repeat satellite repeat_satellite = configuration->property(role + ".repeat_satellite", false); diff --git a/src/algorithms/acquisition/libs/acq_conf_fpga.h b/src/algorithms/acquisition/libs/acq_conf_fpga.h index 11a2c7856..fd20ad953 100644 --- a/src/algorithms/acquisition/libs/acq_conf_fpga.h +++ b/src/algorithms/acquisition/libs/acq_conf_fpga.h @@ -57,6 +57,7 @@ public: uint32_t samples_per_code{1U}; uint32_t code_length{16000U}; bool make_2_steps{false}; + bool enable_zero_padding{true}; bool repeat_satellite{false}; private: From f27eb85af637cf863228e577dc294315331ab50b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 17 Oct 2024 21:38:13 +0200 Subject: [PATCH 11/14] Add new configuration parameters iq_balance_mode and dc_offset_mode to the Osmosdr_Signal_Source --- docs/CHANGELOG.md | 4 ++++ .../adapters/osmosdr_signal_source.cc | 22 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 320421956..60a0bdeae 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -53,6 +53,10 @@ All notable changes to GNSS-SDR will be documented in this file. - Added new [`Cshort_To_Gr_Complex`](https://gnss-sdr.org/docs/sp-blocks/data-type-adapter/#implementation-cshort_to_gr_complex) Data Type Adapter implementation. +- The + [Osmosdr_Signal_Source](https://gnss-sdr.org/docs/sp-blocks/signal-source/#implementation-osmosdr_signal_source) + has gained two new optional configuration parameters: `iq_balance_mode` and + `dc_offset_mode`, both of which are set to Automatic by default. ### Improvements in Portability: diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc index b2f5a6c1f..9071bf22c 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc @@ -86,6 +86,23 @@ OsmosdrSignalSource::OsmosdrSignalSource(const ConfigurationInterface* configura std::cout << "PLL Frequency tune error: " << osmosdr_source_->get_center_freq() - freq_ << " [Hz]...\n"; LOG(INFO) << "PLL Frequency tune error: " << osmosdr_source_->get_center_freq() - freq_ << " [Hz]...\n"; + // Set IQ balance and DC offset modes + // iq balance correction mode: 0 = Off, 1 = Manual, 2 = Automatic + // dc offset correction mode: 0 = Off, 1 = Manual, 2 = Automatic + int iq_balance_mode = configuration->property(role + ".iq_balance_mode", 2); + if (iq_balance_mode < 0 || iq_balance_mode > 2) + { + iq_balance_mode = 2; + } + int dc_offset_mode = configuration->property(role + ".dc_offset_mode", 2); + if (dc_offset_mode < 0 || dc_offset_mode > 2) + { + dc_offset_mode = 2; + } + + osmosdr_source_->set_iq_balance_mode(iq_balance_mode); + osmosdr_source_->set_dc_offset_mode(dc_offset_mode); + // 4. set rx gain if (this->AGC_enabled_ == true) { @@ -128,10 +145,9 @@ OsmosdrSignalSource::OsmosdrSignalSource(const ConfigurationInterface* configura if (if_bw_ > 0.0) { osmosdr_source_->set_bandwidth(if_bw_, 0); + // Get actual bandwidth + std::cout << "Actual Bandwidth: " << osmosdr_source_->get_bandwidth(0) << " [Hz]...\n"; } - - // Get actual bandwidth - std::cout << "Actual Bandwidth: " << osmosdr_source_->get_bandwidth(0) << " [Hz]...\n"; } else { From 949cdde2ea71eb9c326a7dff6e06656ee0597e1e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 29 Oct 2024 11:44:10 +0100 Subject: [PATCH 12/14] Remove temporary file generated at /tmp/file.xxxxxx --- src/algorithms/PVT/libs/kml_printer.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc index 8a520aec3..6394be27d 100644 --- a/src/algorithms/PVT/libs/kml_printer.cc +++ b/src/algorithms/PVT/libs/kml_printer.cc @@ -319,9 +319,13 @@ Kml_Printer::~Kml_Printer() { std::cerr << e.what() << '\n'; } + errorlib::error_code ec; + if (!fs::remove(fs::path(tmp_file_str), ec)) + { + LOG(INFO) << "Error deleting temporary file"; + } if (!positions_printed) { - errorlib::error_code ec; if (!fs::remove(fs::path(kml_filename), ec)) { LOG(INFO) << "Error deleting temporary KML file"; From 882b2271e4d295d4e62b67f9b8d6cf7180a2c852 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 31 Oct 2024 07:48:47 +0100 Subject: [PATCH 13/14] Bump version of local Matio to 1.5.28 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5bd2ee95..8e55d3c68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,7 +359,7 @@ set(GNSSSDR_ABSEIL_MIN_VERSION "20240116") set(GNSSSDR_ARMADILLO_LOCAL_VERSION "14.0.x") set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.1") -set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.27") +set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.28") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "28.2") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.14") set(GNSSSDR_GTEST_LOCAL_VERSION "1.15.2") @@ -2421,6 +2421,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS -DHDF5_USE_STATIC_LIBRARIES=OFF -DMATIO_DEFAULT_FILE_VERSION:STRING=7.3 -DMATIO_MAT73=ON + -DMATIO_BUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${GNSSSDR_BINARY_DIR}/matio BUILD_COMMAND ${CMAKE_COMMAND} "--build" "${GNSSSDR_BINARY_DIR}/matio" From 6a5f80d223d652d4df3a8500d088bc30070b380f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 31 Oct 2024 10:49:22 +0100 Subject: [PATCH 14/14] Remove references to the data folder --- src/algorithms/data_type_adapter/adapters/byte_to_short.cc | 2 +- src/algorithms/input_filter/adapters/beamformer_filter.cc | 2 +- src/algorithms/input_filter/adapters/notch_filter.cc | 2 +- src/algorithms/input_filter/adapters/notch_filter_lite.cc | 2 +- .../resampler/adapters/direct_resampler_conditioner.cc | 2 +- src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc index b853cebc1..d25a23f0e 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -35,7 +35,7 @@ ByteToShort::ByteToShort(const ConfigurationInterface* configuration, { const std::string default_input_item_type("byte"); const std::string default_output_item_type("short"); - const std::string default_dump_filename("./input_filter.dat"); + const std::string default_dump_filename("./data_type_adapter.dat"); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index daa8b1ec5..cf124aeb2 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -34,7 +34,7 @@ BeamformerFilter::BeamformerFilter( dump_(configuration->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_file("./data/input_filter.dat"); + const std::string default_dump_file("./input_filter.dat"); item_type_ = configuration->property(role + ".item_type", default_item_type); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc index 8e8b93392..840985039 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.cc +++ b/src/algorithms/input_filter/adapters/notch_filter.cc @@ -36,7 +36,7 @@ NotchFilter::NotchFilter(const ConfigurationInterface* configuration, dump_(configuration->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_file("./data/input_filter.dat"); + const std::string default_dump_file("./input_filter.dat"); const float default_pfa = 0.001; const float default_p_c_factor = 0.9; const int default_length_ = 32; diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc index 42afd1713..75aa1089d 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc @@ -37,7 +37,7 @@ NotchFilterLite::NotchFilterLite(const ConfigurationInterface* configuration, dump_(configuration->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_file("./data/input_filter.dat"); + const std::string default_dump_file("./input_filter.dat"); const float default_p_c_factor = 0.9; const float default_pfa = 0.001; const float default_samp_freq = 4000000; diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index 57c875742..6b01d3f29 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -43,7 +43,7 @@ DirectResamplerConditioner::DirectResamplerConditioner( dump_(configuration->property(role + ".dump", false)) { const std::string default_item_type("short"); - const std::string default_dump_file("./data/signal_conditioner.dat"); + const std::string default_dump_file("./resampler.dat"); const double fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000.0); const double fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); item_type_ = configuration->property(role + ".item_type", default_item_type); diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index 07f0e2b67..b97bc5a50 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -39,7 +39,7 @@ MmseResamplerConditioner::MmseResamplerConditioner( dump_(configuration->property(role + ".dump", false)) { const std::string default_item_type("gr_complex"); - const std::string default_dump_file("./data/signal_conditioner.dat"); + const std::string default_dump_file("./resampler.dat"); const double fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000.0); const double fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); item_type_ = configuration->property(role + ".item_type", default_item_type);