merge changes next into vtl

gnss-sdr · Dec 7, 2024 · ad813ce · ad813ce
1 parent b407445
commit ad813ce
Show file tree

Hide file tree

Showing 52 changed files with 0 additions and 587 deletions.
diff --git a/conf/File_input/Beidou/gnss-sdr_BDS_B1I_byte.conf b/conf/File_input/Beidou/gnss-sdr_BDS_B1I_byte.conf
@@ -50,11 +50,7 @@ InputFilter.grid_density=16
 InputFilter.sampling_frequency=25000000
 InputFilter.IF=6250000
 InputFilter.dump = false
-<<<<<<< HEAD
-InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/src/tests/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat
-=======
 InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/tests/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat
->>>>>>> next
 Resampler.implementation=Pass_Through
 Resampler.sample_freq_in=25000000
 Resampler.sample_freq_out=25000000

diff --git a/conf/File_input/Beidou/gnss-sdr_BDS_B3I_byte.conf b/conf/File_input/Beidou/gnss-sdr_BDS_B3I_byte.conf
@@ -51,11 +51,7 @@ InputFilter.grid_density=16
 InputFilter.sampling_frequency=50000000
 InputFilter.IF=12500000
 InputFilter.dump = false
-<<<<<<< HEAD
-InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/src/tests/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat
-=======
 InputFilter.dump_filename=/home/dmiralles/Documents/gnss-sdr/tests/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat
->>>>>>> next
 Resampler.implementation=Pass_Through
 Resampler.sample_freq_in=50000000
 Resampler.sample_freq_out=50000000

diff --git a/conf/File_input/Beidou/gnss-sdr_BDS_B3I_short.conf b/conf/File_input/Beidou/gnss-sdr_BDS_B3I_short.conf
@@ -12,11 +12,7 @@ GNSS-SDR.internal_fs_sps=30000000
 
 ;######### SIGNAL_SOURCE CONFIG ############
 SignalSource.implementation=File_Signal_Source
-<<<<<<< HEAD
-;SignalSource.filename=/home/dmiralles/Documents/gnss-sdr/src/tests/signal_samples/USRP_BDS_B2a_201805171115_fs_25e6_if0e3_ishort_200ms.bin
-=======
 ;SignalSource.filename=/home/dmiralles/Documents/gnss-sdr/tests/signal_samples/USRP_BDS_B2a_201805171115_fs_25e6_if0e3_ishort_200ms.bin
->>>>>>> next
 SignalSource.filename=/archive/USRP_BDS_B3I_201805171118_fs_25e6_if0e3_ishort.bin
 SignalSource.item_type=ishort
 SignalSource.sampling_frequency=30000000

diff --git a/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf b/conf/File_input/GPS/gnss-sdr-L1-gaussian.conf
@@ -39,11 +39,7 @@ Acquisition_1C.pfa=0.01
 Acquisition_1C.doppler_max=10000
 Acquisition_1C.doppler_step=250
 Acquisition_1C.dump=false
-<<<<<<< HEAD
-Acquisition_1C.dump_filename=../data/kalman/acq_dump
-=======
 Acquisition_1C.dump_filename=./kalman/acq_dump
->>>>>>> next
 
 ;######### TRACKING GLOBAL CONFIG ############
 Tracking_1C.implementation=GPS_L1_CA_Gaussian_Tracking
@@ -52,11 +48,7 @@ Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=4.0;
 Tracking_1C.order=3;
 Tracking_1C.dump=true
-<<<<<<< HEAD
-Tracking_1C.dump_filename=../data/kalman/epl_tracking_ch_
-=======
 Tracking_1C.dump_filename=./kalman/epl_tracking_ch_
->>>>>>> next
 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
@@ -34,11 +34,7 @@ DataTypeAdapter.item_type=float
 ;######### INPUT_FILTER CONFIG ############
 InputFilter.implementation=Freq_Xlating_Fir_Filter
 InputFilter.dump=false
-<<<<<<< HEAD
-InputFilter.dump_filename=../data/input_filter.dat
-=======
 InputFilter.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter.input_item_type=float
 InputFilter.output_item_type=gr_complex
 InputFilter.taps_item_type=float
@@ -68,11 +64,7 @@ Resampler.item_type=gr_complex
 Resampler.sample_freq_in=80000000
 Resampler.sample_freq_out=4000000
 Resampler.dump=false
-<<<<<<< HEAD
-Resampler.dump_filename=../data/resampler.dat
-=======
 Resampler.dump_filename=./resampler.dat
->>>>>>> next
 
 
 ;######### CHANNELS GLOBAL CONFIG ############
@@ -115,11 +107,7 @@ Tracking_1C.item_type=gr_complex
 Tracking_1C.pll_bw_hz=20.0;
 Tracking_1C.order=3;
 Tracking_1C.dump=false
-<<<<<<< HEAD
-Tracking_1C.dump_filename=../data/epl_tracking_ch_
-=======
 Tracking_1C.dump_filename=./epl_tracking_ch_
->>>>>>> next
 
 
 ;######### 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
@@ -30,22 +30,14 @@ SignalConditioner.implementation=Signal_Conditioner
 ;######### DATA_TYPE_ADAPTER CONFIG ############
 DataTypeAdapter.implementation=Ishort_To_Complex
 DataTypeAdapter.dump=false
-<<<<<<< HEAD
-DataTypeAdapter.dump_filename=../data/data_type_adapter.dat
-=======
 DataTypeAdapter.dump_filename=./data_type_adapter.dat
->>>>>>> next
 
 ;######### INPUT_FILTER CONFIG ############
 InputFilter.implementation=Pass_Through
 InputFilter.input_item_type=gr_complex
 InputFilter.output_item_type=gr_complex
 InputFilter.dump=false
-<<<<<<< HEAD
-InputFilter.dump_filename=../data/input_filter.dat
-=======
 InputFilter.dump_filename=./input_filter.dat
->>>>>>> next
 
 
 ;######### RESAMPLER CONFIG ############
@@ -54,11 +46,7 @@ Resampler.item_type=gr_complex
 Resampler.sample_freq_in=4000000
 Resampler.sample_freq_out=4000000
 Resampler.dump=false
-<<<<<<< HEAD
-Resampler.dump_filename=../data/resampler.dat
-=======
 Resampler.dump_filename=./resampler.dat
->>>>>>> next
 
 
 ;######### 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
@@ -30,11 +30,7 @@ SignalConditioner.implementation=Signal_Conditioner
 
 DataTypeAdapter.implementation=Ishort_To_Complex
 DataTypeAdapter.dump=false
-<<<<<<< HEAD
-DataTypeAdapter.dump_filename=../data/DataTypeAdapter.dat
-=======
 DataTypeAdapter.dump_filename=./DataTypeAdapter.dat
->>>>>>> next
 
 InputFilter.implementation=Pass_Through
 InputFilter.input_item_type=gr_complex
@@ -71,11 +67,7 @@ Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=4.0;
 Tracking_1C.order=3;
 Tracking_1C.dump=false
-<<<<<<< HEAD
-Tracking_1C.dump_filename=../data/epl_tracking_c
-=======
 Tracking_1C.dump_filename=./epl_tracking_c
->>>>>>> next
 
 
 ;######### 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
@@ -24,11 +24,7 @@ SignalSource.sampling_frequency=4000000
 SignalSource.samples=0
 SignalSource.repeat=false
 SignalSource.dump=false
-<<<<<<< HEAD
-SignalSource.dump_filename=../data/signal_source.dat
-=======
 SignalSource.dump_filename=./signal_source.dat
->>>>>>> next
 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
@@ -51,11 +51,7 @@ DataTypeAdapter0.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter0.implementation=Freq_Xlating_Fir_Filter
 InputFilter0.dump=false
-<<<<<<< HEAD
-InputFilter0.dump_filename=../data/input_filter.dat
-=======
 InputFilter0.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter0.input_item_type=gr_complex
 InputFilter0.output_item_type=gr_complex
 InputFilter0.taps_item_type=float
@@ -90,11 +86,7 @@ DataTypeAdapter1.item_type=gr_complex
 ;######### INPUT_FILTER 1 CONFIG ############
 InputFilter1.implementation=Pass_Through
 InputFilter1.dump=false
-<<<<<<< HEAD
-InputFilter1.dump_filename=../data/input_filter.dat
-=======
 InputFilter1.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter1.input_item_type=gr_complex
 InputFilter1.output_item_type=gr_complex
 
@@ -111,11 +103,7 @@ DataTypeAdapter2.item_type=gr_complex
 ;######### INPUT_FILTER 2 CONFIG ############
 InputFilter2.implementation=Pass_Through
 InputFilter2.dump=false
-<<<<<<< HEAD
-InputFilter2.dump_filename=../data/input_filter.dat
-=======
 InputFilter2.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter2.input_item_type=gr_complex
 InputFilter2.output_item_type=gr_complex
 
@@ -165,11 +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
-<<<<<<< HEAD
-Tracking_1C.dump_filename=../data/epl_tracking_ch_
-=======
 Tracking_1C.dump_filename=./epl_tracking_ch_
->>>>>>> next
 
 
 ;######### 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
@@ -50,11 +50,7 @@ DataTypeAdapter0.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter0.implementation=Freq_Xlating_Fir_Filter
 InputFilter0.dump=false
-<<<<<<< HEAD
-InputFilter0.dump_filename=../data/input_filter.dat
-=======
 InputFilter0.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter0.input_item_type=gr_complex
 InputFilter0.output_item_type=gr_complex
 InputFilter0.taps_item_type=float
@@ -89,11 +85,7 @@ DataTypeAdapter1.item_type=gr_complex
 ;######### INPUT_FILTER 1 CONFIG ############
 InputFilter1.implementation=Pass_Through
 InputFilter1.dump=false
-<<<<<<< HEAD
-InputFilter1.dump_filename=../data/input_filter.dat
-=======
 InputFilter1.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter1.input_item_type=gr_complex
 InputFilter1.output_item_type=gr_complex
 
@@ -110,11 +102,7 @@ DataTypeAdapter2.item_type=gr_complex
 ;######### INPUT_FILTER 2 CONFIG ############
 InputFilter2.implementation=Pass_Through
 InputFilter2.dump=false
-<<<<<<< HEAD
-InputFilter2.dump_filename=../data/input_filter.dat
-=======
 InputFilter2.dump_filename=./input_filter.dat
->>>>>>> next
 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
@@ -51,11 +51,7 @@ DataTypeAdapter0.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter0.implementation=Freq_Xlating_Fir_Filter
 InputFilter0.dump=false
-<<<<<<< HEAD
-InputFilter0.dump_filename=../data/input_filter.dat
-=======
 InputFilter0.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter0.input_item_type=gr_complex
 InputFilter0.output_item_type=gr_complex
 InputFilter0.taps_item_type=float
@@ -89,11 +85,7 @@ DataTypeAdapter1.item_type=gr_complex
 ;######### INPUT_FILTER 1 CONFIG ############
 InputFilter1.implementation=Pass_Through
 InputFilter1.dump=false
-<<<<<<< HEAD
-InputFilter1.dump_filename=../data/input_filter.dat
-=======
 InputFilter1.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter1.input_item_type=gr_complex
 InputFilter1.output_item_type=gr_complex
 
@@ -110,11 +102,7 @@ DataTypeAdapter2.item_type=gr_complex
 ;######### INPUT_FILTER 2 CONFIG ############
 InputFilter2.implementation=Pass_Through
 InputFilter2.dump=false
-<<<<<<< HEAD
-InputFilter2.dump_filename=../data/input_filter.dat
-=======
 InputFilter2.dump_filename=./input_filter.dat
->>>>>>> next
 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
@@ -50,11 +50,7 @@ DataTypeAdapter0.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter0.implementation=Freq_Xlating_Fir_Filter
 InputFilter0.dump=false
-<<<<<<< HEAD
-InputFilter0.dump_filename=../data/input_filter.dat
-=======
 InputFilter0.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter0.input_item_type=gr_complex
 InputFilter0.output_item_type=gr_complex
 InputFilter0.taps_item_type=float
@@ -89,11 +85,7 @@ DataTypeAdapter1.item_type=gr_complex
 ;######### INPUT_FILTER 1 CONFIG ############
 InputFilter1.implementation=Pass_Through
 InputFilter1.dump=false
-<<<<<<< HEAD
-InputFilter1.dump_filename=../data/input_filter.dat
-=======
 InputFilter1.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter1.input_item_type=gr_complex
 InputFilter1.output_item_type=gr_complex
 
@@ -110,11 +102,7 @@ DataTypeAdapter2.item_type=gr_complex
 ;######### INPUT_FILTER 2 CONFIG ############
 InputFilter2.implementation=Pass_Through
 InputFilter2.dump=false
-<<<<<<< HEAD
-InputFilter2.dump_filename=../data/input_filter.dat
-=======
 InputFilter2.dump_filename=./input_filter.dat
->>>>>>> next
 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
@@ -50,11 +50,7 @@ DataTypeAdapter0.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter0.implementation=Freq_Xlating_Fir_Filter
 InputFilter0.dump=false
-<<<<<<< HEAD
-InputFilter0.dump_filename=../data/input_filter.dat
-=======
 InputFilter0.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter0.input_item_type=gr_complex
 InputFilter0.output_item_type=gr_complex
 InputFilter0.taps_item_type=float
@@ -89,11 +85,7 @@ DataTypeAdapter1.item_type=gr_complex
 ;######### INPUT_FILTER 1 CONFIG ############
 InputFilter1.implementation=Pass_Through
 InputFilter1.dump=false
-<<<<<<< HEAD
-InputFilter1.dump_filename=../data/input_filter.dat
-=======
 InputFilter1.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter1.input_item_type=gr_complex
 InputFilter1.output_item_type=gr_complex
 
@@ -110,11 +102,7 @@ DataTypeAdapter2.item_type=gr_complex
 ;######### INPUT_FILTER 2 CONFIG ############
 InputFilter2.implementation=Pass_Through
 InputFilter2.dump=false
-<<<<<<< HEAD
-InputFilter2.dump_filename=../data/input_filter.dat
-=======
 InputFilter2.dump_filename=./input_filter.dat
->>>>>>> next
 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
@@ -54,11 +54,7 @@ DataTypeAdapter0.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter0.implementation=Freq_Xlating_Fir_Filter
 InputFilter0.dump=false
-<<<<<<< HEAD
-InputFilter0.dump_filename=../data/input_filter.dat
-=======
 InputFilter0.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter0.input_item_type=gr_complex
 InputFilter0.output_item_type=gr_complex
 InputFilter0.taps_item_type=float
@@ -97,11 +93,7 @@ DataTypeAdapter1.item_type=gr_complex
 ;######### INPUT_FILTER 0 CONFIG ############
 InputFilter1.implementation=Freq_Xlating_Fir_Filter
 InputFilter1.dump=false
-<<<<<<< HEAD
-InputFilter1.dump_filename=../data/input_filter_ch1.dat
-=======
 InputFilter1.dump_filename=./input_filter_ch1.dat
->>>>>>> next
 InputFilter1.input_item_type=gr_complex
 InputFilter1.output_item_type=gr_complex
 InputFilter1.taps_item_type=float
@@ -137,11 +129,7 @@ DataTypeAdapter2.item_type=gr_complex
 ;######### INPUT_FILTER 2 CONFIG ############
 InputFilter2.implementation=Pass_Through
 InputFilter2.dump=false
-<<<<<<< HEAD
-InputFilter2.dump_filename=../data/input_filter.dat
-=======
 InputFilter2.dump_filename=./input_filter.dat
->>>>>>> next
 InputFilter2.input_item_type=gr_complex
 InputFilter2.output_item_type=gr_complex