[hamradio-commits] [gnss-sdr] 177/236: deleting old references to the FLL

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Tue Apr 26 16:02:49 UTC 2016


This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 804132560250bf3e6a50f9f4d832f4dc4c3768f5
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Apr 8 18:19:42 2016 +0200

    deleting old references to the FLL
---
 conf/gnss-sdr_GPS_L1_SPIR.conf                     | 32 +++++------
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       | 64 +--------------------
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf   | 65 +---------------------
 conf/gnss-sdr_GPS_L1_USRP_realtime.conf            |  8 +--
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf            |  6 +-
 conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf           |  8 +--
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |  7 +--
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf          |  2 -
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             |  2 -
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf          |  2 -
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |  2 -
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf   |  2 -
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf        |  6 +-
 conf/gnss-sdr_Galileo_E1_nsr.conf                  |  2 -
 conf/gnss-sdr_Galileo_E1_short.conf                |  6 +-
 conf/gnss-sdr_Galileo_E5a.conf                     |  7 +--
 conf/gnss-sdr_Hybrid_byte.conf                     | 13 +----
 conf/gnss-sdr_Hybrid_byte_sim.conf                 | 13 +----
 conf/gnss-sdr_Hybrid_gr_complex.conf               |  3 +-
 conf/gnss-sdr_Hybrid_nsr.conf                      | 11 +---
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |  6 +-
 ...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf |  8 +--
 ...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf |  8 +--
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf |  8 +--
 ...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf |  8 +--
 ...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf |  5 +-
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf | 10 +---
 ...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |  8 +--
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf |  3 -
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 14 +----
 conf/gnss-sdr_multisource_Hybrid_nsr.conf          | 13 +----
 conf/gnss-sdr_multisource_Hybrid_short.conf        | 11 +---
 32 files changed, 57 insertions(+), 306 deletions(-)

diff --git a/conf/gnss-sdr_GPS_L1_SPIR.conf b/conf/gnss-sdr_GPS_L1_SPIR.conf
index 9229290..620307e 100644
--- a/conf/gnss-sdr_GPS_L1_SPIR.conf
+++ b/conf/gnss-sdr_GPS_L1_SPIR.conf
@@ -23,7 +23,7 @@ SignalSource.filename=/media/fabra/dd44068b-f808-4164-834c-35b550037514/CTTC/spi
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
 SignalSource.item_type=int
 
-;#sampling_frequency: Original Signal sampling frequency in [Hz] 
+;#sampling_frequency: Original Signal sampling frequency in [Hz]
 SignalSource.sampling_frequency=80000000
 
 ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file.
@@ -39,12 +39,12 @@ SignalSource.dump_filename=../data/signal_source.dat
 
 
 ;#enable_throttle_control: Enabling this option tells the signal source to keep the delay between samples in post processing.
-; it helps to not overload the CPU, but the processing time will be longer. 
+; it helps to not overload the CPU, but the processing time will be longer.
 SignalSource.enable_throttle_control=false
 
 
 ;######### SIGNAL_CONDITIONER CONFIG ############
-;## It holds blocks to change data type, filter and resample input data. 
+;## It holds blocks to change data type, filter and resample input data.
 
 ;#implementation: Use [Pass_Through] or [Signal_Conditioner]
 ;#[Pass_Through] disables this block and the [DataTypeAdapter], [InputFilter] and [Resampler] blocks
@@ -75,7 +75,7 @@ InputFilter.dump=false
 ;#dump_filename: Log path and filename.
 InputFilter.dump_filename=../data/input_filter.dat
 
-;#The following options are used in the filter design of Fir_Filter and Freq_Xlating_Fir_Filter implementation. 
+;#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.
 ;#These function calculates the optimal (in the Chebyshev/minimax sense) FIR filter inpulse reponse given a set of band edges, the desired reponse on those bands, and the weight given to the error in those bands.
 
@@ -116,7 +116,7 @@ InputFilter.ampl2_end=0.0
 InputFilter.band1_error=1.0
 InputFilter.band2_error=1.0
 
-;#filter_type: one of "bandpass", "hilbert" or "differentiator" 
+;#filter_type: one of "bandpass", "hilbert" or "differentiator"
 InputFilter.filter_type=bandpass
 
 ;#grid_density: determines how accurately the filter will be constructed.
@@ -133,7 +133,7 @@ InputFilter.decimation_factor=20
 
 
 ;######### RESAMPLER CONFIG ############
-;## Resamples the input data. 
+;## Resamples the input data.
 
 ;#implementation: Use [Pass_Through] or [Direct_Resampler]
 ;#[Pass_Through] disables this block
@@ -164,7 +164,7 @@ Channels_1B.count=0
 ;#in_acquisition: Number of channels simultaneously acquiring
 Channels.in_acquisition=1
 
-;#signal: 
+;#signal:
 ;# "1C" GPS L1 C/A
 ;# "1B" Galileo E1B
 Channel.signal=1C
@@ -193,13 +193,13 @@ Channel.signal=1C
 
 ;######### ACQUISITION GLOBAL CONFIG ############
 _1C
-;#dump: Enable or disable the acquisition internal data file logging [true] or [false] 
+;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
 Acquisition_1C.dump=false
 ;#filename: Log path and filename
 Acquisition_1C.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
 Acquisition_1C.item_type=gr_complex
-;#if: Signal intermediate frequency in [Hz] 
+;#if: Signal intermediate frequency in [Hz]
 Acquisition_1C.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
 Acquisition_1C.sampled_ms=1
@@ -207,7 +207,7 @@ Acquisition_1C.sampled_ms=1
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
 ;#threshold: Acquisition threshold
 Acquisition_1C.threshold=0.005
-;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition] 
+;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
 ;Acquisition_1C.pfa=0.0001
 ;#doppler_max: Maximum expected Doppler shift [Hz]
 Acquisition_1C.doppler_max=10000
@@ -228,7 +228,7 @@ Acquisition_1C.max_dwells=5
 ;Acquisition2.repeat_satellite = true
 ;Acquisition3.repeat_satellite = true
 
-;#cboc: Only for [Galileo_E1_PCPS_Ambiguous_Acquisition]. This option allows you to choose between acquiring with CBOC signal [true] or sinboc(1,1) signal [false]. 
+;#cboc: Only for [Galileo_E1_PCPS_Ambiguous_Acquisition]. This option allows you to choose between acquiring with CBOC signal [true] or sinboc(1,1) signal [false].
 ;#Use only if GNSS-SDR.internal_fs_hz is greater than or equal to 6138000
 Acquisition0.cboc=false
 
@@ -238,15 +238,15 @@ Acquisition1.cboc=false
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1C.item_type=gr_complex
 
-;#sampling_frequency: Signal Intermediate Frequency in [Hz] 
+;#sampling_frequency: Signal Intermediate Frequency in [Hz]
 Tracking_1C.if=0
 
-;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] 
+;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
 Tracking_1C.dump=false
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
@@ -258,9 +258,6 @@ Tracking_1C.pll_bw_hz=20.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -315,4 +312,3 @@ PVT.nmea_dump_devname=/dev/pts/4
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
index 04a3c38..02b1485 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
@@ -186,62 +186,6 @@ Channels.in_acquisition=1
 ;#if the option is disabled by default is assigned GPS
 Channel.system=GPS
 
-;#signal:
-;# "1C" GPS L1 C/A
-;# "1P" GPS L1 P
-;# "1W" GPS L1 Z-tracking and similar (AS on)
-;# "1Y" GPS L1 Y
-;# "1M" GPS L1 M
-;# "1N" GPS L1 codeless
-;# "2C" GPS L2 C/A
-;# "2D" GPS L2 L1(C/A)+(P2-P1) semi-codeless
-;# "2S" GPS L2 L2C (M)
-;# "2L" GPS L2 L2C (L)
-;# "2X" GPS L2 L2C (M+L)
-;# "2P" GPS L2 P
-;# "2W" GPS L2 Z-tracking and similar (AS on)
-;# "2Y" GPS L2 Y
-;# "2M" GPS GPS L2 M
-;# "2N" GPS L2 codeless
-;# "5I" GPS L5 I
-;# "5Q" GPS L5 Q
-;# "5X" GPS L5 I+Q
-;# "1C" GLONASS G1 C/A
-;# "1P" GLONASS G1 P
-;# "2C" GLONASS G2 C/A  (Glonass M)
-;# "2P" GLONASS G2 P
-;# "1A" GALILEO E1 A (PRS)
-;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
-;# "1C" GALILEO E1 C (no data)
-;# "1X" GALILEO E1 B+C
-;# "1Z" GALILEO E1 A+B+C
-;# "5I" GALILEO E5a I (F/NAV OS)
-;# "5Q" GALILEO E5a Q  (no data)
-;# "5X" GALILEO E5a I+Q
-;# "7I" GALILEO E5b I
-;# "7Q" GALILEO E5b Q
-;# "7X" GALILEO E5b I+Q
-;# "8I" GALILEO E5 I
-;# "8Q" GALILEO E5 Q
-;# "8X" GALILEO E5 I+Q
-;# "6A" GALILEO E6 A
-;# "6B" GALILEO E6 B
-;# "6C" GALILEO E6 C
-;# "6X" GALILEO E6 B+C
-;# "6Z" GALILEO E6 A+B+C
-;# "1C" SBAS L1 C/A
-;# "5I" SBAS L5 I
-;# "5Q" SBAS L5 Q
-;# "5X" SBAS L5 I+Q
-;# "2I" COMPASS E2 I
-;# "2Q" COMPASS E2 Q
-;# "2X" COMPASS E2 IQ
-;# "7I" COMPASS E5b I
-;# "7Q" COMPASS E5b Q
-;# "7X" COMPASS E5b IQ
-;# "6I" COMPASS E6 I
-;# "6Q" COMPASS E6 Q
-;# "6X" COMPASS E6 IQ
 ;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 Channel.signal=1C
 
@@ -298,9 +242,9 @@ Acquisition_GPS.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_GPS.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -318,9 +262,6 @@ Tracking_GPS.pll_bw_hz=30.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_GPS.dll_bw_hz=4.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_GPS.order=3;
 
@@ -381,4 +322,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf
index 88efbae..c8030fb 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf
@@ -189,63 +189,6 @@ Channels.in_acquisition=1
 ;#if the option is disabled by default is assigned GPS
 ;Channel.system=GPS
 Channel.signal=1C
-
-;#signal:
-;# "1C" GPS L1 C/A
-;# "1P" GPS L1 P
-;# "1W" GPS L1 Z-tracking and similar (AS on)
-;# "1Y" GPS L1 Y
-;# "1M" GPS L1 M
-;# "1N" GPS L1 codeless
-;# "2C" GPS L2 C/A
-;# "2D" GPS L2 L1(C/A)+(P2-P1) semi-codeless
-;# "2S" GPS L2 L2C (M)
-;# "2L" GPS L2 L2C (L)
-;# "2X" GPS L2 L2C (M+L)
-;# "2P" GPS L2 P
-;# "2W" GPS L2 Z-tracking and similar (AS on)
-;# "2Y" GPS L2 Y
-;# "2M" GPS GPS L2 M
-;# "2N" GPS L2 codeless
-;# "5I" GPS L5 I
-;# "5Q" GPS L5 Q
-;# "5X" GPS L5 I+Q
-;# "1C" GLONASS G1 C/A
-;# "1P" GLONASS G1 P
-;# "2C" GLONASS G2 C/A  (Glonass M)
-;# "2P" GLONASS G2 P
-;# "1A" GALILEO E1 A (PRS)
-;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
-;# "1C" GALILEO E1 C (no data)
-;# "1X" GALILEO E1 B+C
-;# "1Z" GALILEO E1 A+B+C
-;# "5I" GALILEO E5a I (F/NAV OS)
-;# "5Q" GALILEO E5a Q  (no data)
-;# "5X" GALILEO E5a I+Q
-;# "7I" GALILEO E5b I
-;# "7Q" GALILEO E5b Q
-;# "7X" GALILEO E5b I+Q
-;# "8I" GALILEO E5 I
-;# "8Q" GALILEO E5 Q
-;# "8X" GALILEO E5 I+Q
-;# "6A" GALILEO E6 A
-;# "6B" GALILEO E6 B
-;# "6C" GALILEO E6 C
-;# "6X" GALILEO E6 B+C
-;# "6Z" GALILEO E6 A+B+C
-;# "1C" SBAS L1 C/A
-;# "5I" SBAS L5 I
-;# "5Q" SBAS L5 Q
-;# "5X" SBAS L5 I+Q
-;# "2I" COMPASS E2 I
-;# "2Q" COMPASS E2 Q
-;# "2X" COMPASS E2 IQ
-;# "7I" COMPASS E5b I
-;# "7Q" COMPASS E5b Q
-;# "7X" COMPASS E5b IQ
-;# "6I" COMPASS E6 I
-;# "6Q" COMPASS E6 Q
-;# "6X" COMPASS E6 IQ
 ;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 
 ;Channel0.signal=1C
@@ -314,9 +257,9 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -334,9 +277,6 @@ Tracking_1C.pll_bw_hz=30.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=4.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -397,4 +337,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
index 38adb76..cbf979b 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
@@ -298,9 +298,9 @@ Acquisition_GPS.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_GPS.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -318,9 +318,6 @@ Tracking_GPS.pll_bw_hz=50.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_GPS.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_GPS.order=3;
 
@@ -382,4 +379,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
index 7ef0bab..891c4b0 100644
--- a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
@@ -226,7 +226,7 @@ Acquisition_1C.doppler_step=250
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1C.item_type=gr_complex
@@ -246,9 +246,6 @@ Tracking_1C.pll_bw_hz=50.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=4.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -299,4 +296,3 @@ 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/gnss-sdr_GPS_L1_gr_complex_gpu.conf b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
index 48a00fb..9de6726 100644
--- a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
+++ b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
@@ -214,9 +214,9 @@ Acquisition_GPS.doppler_step=100
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking_GPU
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_GPS.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -234,9 +234,6 @@ Tracking_GPS.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_GPS.dll_bw_hz=1.5
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=2.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_GPS.order=3;
 
@@ -294,4 +291,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
index 1c3b4e9..6d25c6e 100644
--- a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
@@ -209,9 +209,9 @@ Acquisition_1C.max_dwells=15
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] [GPS_L1_CA_DLL_PLL_Optim_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] [GPS_L1_CA_DLL_PLL_Optim_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -229,9 +229,6 @@ Tracking_1C.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
diff --git a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
index 72fa2cc..eeef634 100644
--- a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
@@ -111,7 +111,6 @@ Tracking_1C.dump=false
 Tracking_1C.dump_filename=./tracking_ch_
 Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=2.0;
-Tracking_1C.fll_bw_hz=10.0;
 Tracking_1C.order=3;
 Tracking_1C.early_late_space_chips=0.5;
 
@@ -145,4 +144,3 @@ PVT.dump=false
 PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
-
diff --git a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
index fc3b6a1..23e624b 100644
--- a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
+++ b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
@@ -104,7 +104,6 @@ Tracking_1C.dump=true
 Tracking_1C.dump_filename=./tracking_ch_
 Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=1.5;
-Tracking_1C.fll_bw_hz=10.0;
 Tracking_1C.order=3;
 
 
@@ -133,4 +132,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
index 9c15c8b..8333637 100644
--- a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
+++ b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
@@ -174,7 +174,6 @@ Tracking_2S.dump=true
 Tracking_2S.dump_filename=./tracking_ch_
 Tracking_2S.pll_bw_hz=1.5;
 Tracking_2S.dll_bw_hz=0.3;
-Tracking_2S.fll_bw_hz=2.0;
 Tracking_2S.order=3;
 Tracking_2S.early_late_space_chips=0.5;
 
@@ -203,4 +202,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
index 1ff5a37..cc25f9f 100644
--- a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
@@ -131,7 +131,6 @@ Tracking_2S.dump=true
 Tracking_2S.dump_filename=./tracking_ch_
 Tracking_2S.pll_bw_hz=2.0;
 Tracking_2S.dll_bw_hz=0.25;
-Tracking_2S.fll_bw_hz=0.0;
 Tracking_2S.order=2;
 Tracking_2S.early_late_space_chips=0.5;
 
@@ -160,4 +159,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf b/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
index e868ca8..a45557b 100644
--- a/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
@@ -55,7 +55,6 @@ Tracking_1B.dump=false
 Tracking_1B.dump_filename=../data/veml_tracking_ch_
 Tracking_1B.pll_bw_hz=20.0;
 Tracking_1B.dll_bw_hz=2.0;
-Tracking_1B.fll_bw_hz=10.0;
 Tracking_1B.order=3;
 Tracking_1B.early_late_space_chips=0.15;
 Tracking_1B.very_early_late_space_chips=0.6;
@@ -83,4 +82,3 @@ PVT.nmea_dump_devname=/dev/pts/4
 PVT.flag_rtcm_server=true
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
-
diff --git a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
index 290e4b5..6dc0f62 100644
--- a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
@@ -206,7 +206,7 @@ Acquisition_1B.cboc=false
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1B.item_type=gr_complex
@@ -226,9 +226,6 @@ Tracking_1B.pll_bw_hz=20.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -298,4 +295,3 @@ PVT.flag_rtcm_tty_port=false;
 
 ;#rtcm_dump_devname: serial device descriptor for RTCM logging
 PVT.rtcm_dump_devname=/dev/pts/1
-
diff --git a/conf/gnss-sdr_Galileo_E1_nsr.conf b/conf/gnss-sdr_Galileo_E1_nsr.conf
index 20f314d..d02cba2 100644
--- a/conf/gnss-sdr_Galileo_E1_nsr.conf
+++ b/conf/gnss-sdr_Galileo_E1_nsr.conf
@@ -99,7 +99,6 @@ Tracking_1B.dump=false
 Tracking_1B.dump_filename=../data/veml_tracking_ch_
 Tracking_1B.pll_bw_hz=20.0;
 Tracking_1B.dll_bw_hz=2.0;
-Tracking_1B.fll_bw_hz=10.0;
 Tracking_1B.order=3;
 Tracking_1B.early_late_space_chips=0.15;
 Tracking_1B.very_early_late_space_chips=0.6;
@@ -128,4 +127,3 @@ 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/gnss-sdr_Galileo_E1_short.conf b/conf/gnss-sdr_Galileo_E1_short.conf
index 4b9d584..34f6b0b 100644
--- a/conf/gnss-sdr_Galileo_E1_short.conf
+++ b/conf/gnss-sdr_Galileo_E1_short.conf
@@ -203,7 +203,7 @@ Acquisition_1B.cboc=false
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1B.item_type=gr_complex
@@ -223,9 +223,6 @@ Tracking_1B.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -293,4 +290,3 @@ PVT.flag_rtcm_tty_port=false;
 
 ;#rtcm_dump_devname: serial device descriptor for RTCM logging
 PVT.rtcm_dump_devname=/dev/pts/1
-
diff --git a/conf/gnss-sdr_Galileo_E5a.conf b/conf/gnss-sdr_Galileo_E5a.conf
index 65c6bdd..43a11aa 100644
--- a/conf/gnss-sdr_Galileo_E5a.conf
+++ b/conf/gnss-sdr_Galileo_E5a.conf
@@ -247,10 +247,9 @@ Acquisition_5X.CAF_window_hz=0
 Acquisition_5X.Zero_padding=0
 
 
-
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_5X.implementation=Galileo_E5a_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_5X.item_type=gr_complex
@@ -280,9 +279,6 @@ Tracking_5X.pll_bw_hz=20.0;
 ;Tracking.dll_bw_hz=2.0;
 Tracking_5X.dll_bw_hz=20.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-;Tracking_5X.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_5X.order=2;
 
@@ -343,4 +339,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_Hybrid_byte.conf b/conf/gnss-sdr_Hybrid_byte.conf
index 729c2cb..27e63d6 100644
--- a/conf/gnss-sdr_Hybrid_byte.conf
+++ b/conf/gnss-sdr_Hybrid_byte.conf
@@ -232,7 +232,7 @@ Acquisition_1B.doppler_step=125
 
 ;######### TRACKING GPS CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1C.item_type=gr_complex
@@ -252,17 +252,14 @@ Tracking_1C.pll_bw_hz=45.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=4.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
 ;######### TRACKING GALILEO CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1B.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -280,9 +277,6 @@ Tracking_1B.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -342,4 +336,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
 PVT.dump_filename=./PVT
-
diff --git a/conf/gnss-sdr_Hybrid_byte_sim.conf b/conf/gnss-sdr_Hybrid_byte_sim.conf
index 7208a89..91a8ee5 100644
--- a/conf/gnss-sdr_Hybrid_byte_sim.conf
+++ b/conf/gnss-sdr_Hybrid_byte_sim.conf
@@ -242,7 +242,7 @@ Acquisition_1B.doppler_step=125
 
 ;######### TRACKING GPS CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_C_Aid_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1C.item_type=cshort
@@ -262,17 +262,14 @@ Tracking_1C.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=1.5;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=2.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
 ;######### TRACKING GALILEO CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1B.item_type=cshort
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -290,9 +287,6 @@ Tracking_1B.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -352,4 +346,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
 PVT.dump_filename=./PVT
-
diff --git a/conf/gnss-sdr_Hybrid_gr_complex.conf b/conf/gnss-sdr_Hybrid_gr_complex.conf
index ea60c18..9a73110 100644
--- a/conf/gnss-sdr_Hybrid_gr_complex.conf
+++ b/conf/gnss-sdr_Hybrid_gr_complex.conf
@@ -226,7 +226,7 @@ Acquisition_1B.doppler_step=125
 
 ;######### TRACKING GPS CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_C_Aid_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1C.item_type=gr_complex
@@ -345,4 +345,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
 PVT.dump_filename=./PVT
-
diff --git a/conf/gnss-sdr_Hybrid_nsr.conf b/conf/gnss-sdr_Hybrid_nsr.conf
index c473174..ae2a7c5 100644
--- a/conf/gnss-sdr_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_Hybrid_nsr.conf
@@ -251,14 +251,11 @@ Tracking_1C.extend_correlation_ms=1
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
 
 Tracking_1C.pll_bw_hz=40;
-Tracking_1C.pll_bw_narrow_hz=40;
+Tracking_1C.pll_bw_narrow_hz=20;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=2.0;
-Tracking_1C.dll_bw_narrow_hz=2.0;
-
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
+Tracking_1C.dll_bw_narrow_hz=1.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
@@ -285,9 +282,6 @@ Tracking_1B.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -347,4 +341,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
 PVT.dump_filename=./PVT
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
index 8767b21..1464d2a 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
@@ -258,7 +258,7 @@ Acquisition_GPS.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_GPS.item_type=gr_complex
@@ -278,9 +278,6 @@ Tracking_GPS.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_GPS.dll_bw_hz=3.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_GPS.order=3;
 
@@ -341,4 +338,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
index f5fd7cd..2ff362b 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
@@ -266,9 +266,9 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -286,9 +286,6 @@ Tracking_1C.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=3.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -349,4 +346,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
index 00cf01b..482ba1c 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
@@ -264,9 +264,9 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -284,9 +284,6 @@ Tracking_1C.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=3.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -347,4 +344,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
index 660aa89..3072fce 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
@@ -265,9 +265,9 @@ Acquisition_GPS.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_GPS.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -285,9 +285,6 @@ Tracking_GPS.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_GPS.dll_bw_hz=3.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_GPS.order=3;
 
@@ -348,4 +345,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
index 12fc2ba..5724fc8 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
@@ -260,9 +260,9 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -280,9 +280,6 @@ Tracking_1C.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=3.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -343,4 +340,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
index 9824f47..9bcdbb2 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
@@ -394,7 +394,7 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
@@ -403,7 +403,6 @@ Tracking_1C.dump=true
 Tracking_1C.dump_filename=./tracking_ch_
 Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=3.0;
-Tracking_1C.fll_bw_hz=10.0;
 Tracking_1C.order=3;
 Tracking_1C.early_late_space_chips=0.5;
 
@@ -427,7 +426,6 @@ Tracking_2S.dump=true
 Tracking_2S.dump_filename=./tracking_ch_
 Tracking_2S.pll_bw_hz=1.5;
 Tracking_2S.dll_bw_hz=0.3;
-Tracking_2S.fll_bw_hz=2.0;
 Tracking_2S.order=3;
 Tracking_2S.early_late_space_chips=0.5;
 
@@ -493,4 +491,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf
index 41017b8..68e5a0b 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf
@@ -376,7 +376,7 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking_GPU
 Tracking_1C.item_type=gr_complex
@@ -385,7 +385,6 @@ Tracking_1C.dump=false
 Tracking_1C.dump_filename=../data/epl_tracking_ch_
 Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=1.5;
-Tracking_1C.fll_bw_hz=10.0;
 Tracking_1C.order=3;
 Tracking_1C.early_late_space_chips=0.5;
 
@@ -409,7 +408,6 @@ Tracking_2S.dump=false
 Tracking_2S.dump_filename=./tracking_ch_
 Tracking_2S.pll_bw_hz=1.5;
 Tracking_2S.dll_bw_hz=0.3;
-Tracking_2S.fll_bw_hz=2.0;
 Tracking_2S.order=3;
 Tracking_2S.early_late_space_chips=0.5;
 
@@ -438,7 +436,7 @@ Acquisition_1B.doppler_max=5000
 ;#doppler_max: Doppler step in the grid search [Hz]
 Acquisition_1B.doppler_step=125
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1B.item_type=gr_complex
@@ -458,9 +456,6 @@ Tracking_1B.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -539,4 +534,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
index ab5a9ab..df7270b 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
@@ -334,9 +334,9 @@ Acquisition_1C.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -354,9 +354,6 @@ Tracking_1C.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=4.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -417,4 +414,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
index 08c1788..1525d8f 100644
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf
@@ -365,7 +365,6 @@ Tracking_1C0.dump=false
 Tracking_1C0.dump_filename=./tracking_ch_
 Tracking_1C0.pll_bw_hz=40.0;
 Tracking_1C0.dll_bw_hz=3.0;
-Tracking_1C0.fll_bw_hz=10.0;
 Tracking_1C0.order=3;
 Tracking_1C0.early_late_space_chips=0.5;
 
@@ -378,7 +377,6 @@ Tracking_2S1.dump=false
 Tracking_2S1.dump_filename=./tracking_ch_
 Tracking_2S1.pll_bw_hz=2.0;
 Tracking_2S1.dll_bw_hz=0.5;
-Tracking_2S1.fll_bw_hz=2.0;
 Tracking_2S1.order=2;
 Tracking_2S1.early_late_space_chips=0.5;
 
@@ -440,4 +438,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
index 259425e..36c3b6f 100644
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
@@ -470,7 +470,7 @@ Acquisition_2S8.max_dwells=1
 
 ;######### TRACKING GLOBAL CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1C.item_type=gr_complex
@@ -490,9 +490,6 @@ Tracking_1C.pll_bw_hz=40.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=3.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
@@ -508,7 +505,6 @@ Tracking_2S1.dump=true
 Tracking_2S1.dump_filename=./tracking_ch_
 Tracking_2S1.pll_bw_hz=2.0;
 Tracking_2S1.dll_bw_hz=0.5;
-Tracking_2S1.fll_bw_hz=2.0;
 Tracking_2S1.order=3;
 Tracking_2S1.early_late_space_chips=0.5;
 ;######### TRACKING CHANNEL 9 CONFIG ############
@@ -519,7 +515,6 @@ Tracking_2S2.dump=true
 Tracking_2S2.dump_filename=./tracking_ch_
 Tracking_2S2.pll_bw_hz=2.0;
 Tracking_2S2.dll_bw_hz=0.5;
-Tracking_2S2.fll_bw_hz=2.0;
 Tracking_2S2.order=3;
 Tracking_2S2.early_late_space_chips=0.5;
 ;######### TRACKING CHANNEL 10 CONFIG ############
@@ -530,7 +525,6 @@ Tracking_2S3.dump=true
 Tracking_2S3.dump_filename=./tracking_ch_
 Tracking_2S3.pll_bw_hz=2.0;
 Tracking_2S3.dll_bw_hz=0.5;
-Tracking_2S3.fll_bw_hz=2.0;
 Tracking_2S3.order=3;
 Tracking_2S3.early_late_space_chips=0.5;
 ;######### TRACKING CHANNEL 11 CONFIG ############
@@ -541,7 +535,6 @@ Tracking_2S4.dump=true
 Tracking_2S4.dump_filename=./tracking_ch_
 Tracking_2S4.pll_bw_hz=2.0;
 Tracking_2S4.dll_bw_hz=0.3;
-Tracking_2S4.fll_bw_hz=2.0;
 Tracking_2S4.order=3;
 Tracking_2S4.early_late_space_chips=0.5;
 
@@ -553,7 +546,6 @@ Tracking_2S5.dump=true
 Tracking_2S5.dump_filename=./tracking_ch_
 Tracking_2S5.pll_bw_hz=2.0;
 Tracking_2S5.dll_bw_hz=0.3;
-Tracking_2S5.fll_bw_hz=2.0;
 Tracking_2S5.order=3;
 Tracking_2S5.early_late_space_chips=0.5;
 ;######### TRACKING CHANNEL 13 CONFIG ############
@@ -564,7 +556,6 @@ Tracking_2S6.dump=true
 Tracking_2S6.dump_filename=./tracking_ch_
 Tracking_2S6.pll_bw_hz=2.0;
 Tracking_2S6.dll_bw_hz=0.3;
-Tracking_2S6.fll_bw_hz=2.0;
 Tracking_2S6.order=3;
 Tracking_2S6.early_late_space_chips=0.5;
 ;######### TRACKING CHANNEL 14 CONFIG ############
@@ -575,7 +566,6 @@ Tracking_2S7.dump=true
 Tracking_2S7.dump_filename=./tracking_ch_
 Tracking_2S7.pll_bw_hz=2.0;
 Tracking_2S7.dll_bw_hz=0.3;
-Tracking_2S7.fll_bw_hz=2.0;
 Tracking_2S7.order=3;
 Tracking_2S7.early_late_space_chips=0.5;
 ;######### TRACKING CHANNEL 15 CONFIG ############
@@ -586,7 +576,6 @@ Tracking_2S8.dump=true
 Tracking_2S8.dump_filename=./tracking_ch_
 Tracking_2S8.pll_bw_hz=2.0;
 Tracking_2S8.dll_bw_hz=0.3;
-Tracking_2S8.fll_bw_hz=2.0;
 Tracking_2S8.order=3;
 Tracking_2S8.early_late_space_chips=0.5;
 
@@ -654,4 +643,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
index 58e8709..a6f2f78 100644
--- a/conf/gnss-sdr_multisource_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
@@ -378,9 +378,9 @@ Acquisition_1B.doppler_step=125
 
 ;######### TRACKING GPS CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
-;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
+;#item_type: Type and resolution for each of the signal samples.
 Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
@@ -398,15 +398,12 @@ Tracking_1C.pll_bw_hz=45.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1C.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1C.order=3;
 
 ;######### TRACKING GALILEO CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_1B.item_type=gr_complex
@@ -426,9 +423,6 @@ Tracking_1B.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_1B.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_1B.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_1B.order=3;
 
@@ -489,4 +483,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
 PVT.dump_filename=./PVT
-
diff --git a/conf/gnss-sdr_multisource_Hybrid_short.conf b/conf/gnss-sdr_multisource_Hybrid_short.conf
index 2ef4255..d62f94e 100644
--- a/conf/gnss-sdr_multisource_Hybrid_short.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_short.conf
@@ -365,7 +365,7 @@ Acquisition_Galileo.doppler_step=125
 
 ;######### TRACKING GPS CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_GPS.item_type=gr_complex
@@ -385,15 +385,12 @@ Tracking_GPS.pll_bw_hz=45.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_GPS.dll_bw_hz=4.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_GPS.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_GPS.order=3;
 
 ;######### TRACKING GALILEO CONFIG ############
 
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
+;#implementation: Selected tracking algorithm: [Galileo_E1_DLL_PLL_VEML_Tracking]
 Tracking_Galileo.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking_Galileo.item_type=gr_complex
@@ -413,9 +410,6 @@ Tracking_Galileo.pll_bw_hz=15.0;
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
 Tracking_Galileo.dll_bw_hz=2.0;
 
-;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking_Galileo.fll_bw_hz=10.0;
-
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking_Galileo.order=3;
 
@@ -475,4 +469,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump and ".kml" to GoogleEarth dump.
 PVT.dump_filename=./PVT
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git



More information about the pkg-hamradio-commits mailing list