Fixed bug in gnss_flowgraph.cc.

Galileo satellites added to available_GNSS_signals_

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@239 64b25241-fba3-4117-9849-534c7e92360d

conf/gnss-sdr_Galileo_E1.conf

@@ -0,0 +1,450 @@
+; Default configuration file
+; 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_hz: Internal signal sampling frequency after the signal conditioning stage [Hz].
+GNSS-SDR.internal_fs_hz=8000000
+
+;######### CONTROL_THREAD CONFIG ############
+ControlThread.wait_for_flowgraph=false
+
+;######### SIGNAL_SOURCE CONFIG ############
+;#implementation: Use [File_Signal_Source] or [UHD_Signal_Source] or [GN3S_Signal_Source] (experimental)
+SignalSource.implementation=File_Signal_Source
+
+;#filename: path to file with the captured GNSS signal samples to be processed
+SignalSource.filename=/media/DATA/Proyectos/Signals/cttc_2012_07_26/cp_cttc_2012_07_26_n6_8Msps.dat
+
+;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
+SignalSource.item_type=gr_complex
+
+;#sampling_frequency: Original Signal sampling frequency in [Hz] 
+SignalSource.sampling_frequency=8000000
+
+;#freq: RF front-end center frequency in [Hz] 
+SignalSource.freq=1575420000
+
+;#gain: Front-end Gain in [dB] 
+SignalSource.gain=60
+
+;#subdevice: UHD subdevice specification (for USRP1 use A:0 or B:0)
+SignalSource.subdevice=B:0
+
+;#samples: Number of samples to be processed. Notice that 0 indicates the entire file.
+SignalSource.samples=0
+
+;#repeat: Repeat the processing file. Disable this option in this version
+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
+
+
+;#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. 
+SignalSource.enable_throttle_control=false
+
+
+;######### SIGNAL_CONDITIONER CONFIG ############
+;## 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
+;#[Signal_Conditioner] enables this block. Then you have to configure [DataTypeAdapter], [InputFilter] and [Resampler] blocks
+;SignalConditioner.implementation=Signal_Conditioner
+SignalConditioner.implementation=Pass_Through
+
+;######### DATA_TYPE_ADAPTER CONFIG ############
+;## Changes the type of input data. Please disable it in this version.
+;#implementation: [Pass_Through] disables this block
+DataTypeAdapter.implementation=Pass_Through
+
+;######### INPUT_FILTER CONFIG ############
+;## Filter the input data. Can be combined with frequency translation for IF signals
+
+;#implementation: Use [Pass_Through] or [Fir_Filter] or [Freq_Xlating_Fir_Filter]
+;#[Pass_Through] disables this block
+;#[Fir_Filter] enables a FIR Filter
+;#[Freq_Xlating_Fir_Filter] enables FIR filter and a composite frequency translation that shifts IF down to zero Hz.
+
+;InputFilter.implementation=Fir_Filter
+;InputFilter.implementation=Freq_Xlating_Fir_Filter
+InputFilter.implementation=Pass_Through
+
+;#dump: Dump the filtered data to a file.
+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. 
+;#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.
+
+;#input_item_type: Type and resolution for input signal samples. Use only gr_complex in this version.
+InputFilter.input_item_type=gr_complex
+
+;#outut_item_type: Type and resolution for output filtered signal samples. Use only gr_complex in this version.
+InputFilter.output_item_type=gr_complex
+
+;#taps_item_type: Type and resolution for the taps of the filter. Use only float in this version.
+InputFilter.taps_item_type=float
+
+;#number_of_taps: Number of taps in the filter. Increasing this parameter increases the processing time
+InputFilter.number_of_taps=5
+
+;#number_of _bands: Number of frequency bands in the filter.
+InputFilter.number_of_bands=2
+
+;#bands: frequency at the band edges [ b1 e1 b2 e2 b3 e3 ...].
+;#Frequency is in the range [0, 1], with 1 being the Nyquist frequency (Fs/2)
+;#The number of band_begin and band_end elements must match the number of bands
+
+InputFilter.band1_begin=0.0
+InputFilter.band1_end=0.45
+InputFilter.band2_begin=0.55
+InputFilter.band2_end=1.0
+
+;#ampl: desired amplitude at the band edges [ a(b1) a(e1) a(b2) a(e2) ...].
+;#The number of ampl_begin and ampl_end elements must match the number of bands
+
+InputFilter.ampl1_begin=1.0
+InputFilter.ampl1_end=1.0
+InputFilter.ampl2_begin=0.0
+InputFilter.ampl2_end=0.0
+
+;#band_error: weighting applied to each band (usually 1).
+;#The number of band_error elements must match the number of bands
+InputFilter.band1_error=1.0
+InputFilter.band2_error=1.0
+
+;#filter_type: one of "bandpass", "hilbert" or "differentiator" 
+InputFilter.filter_type=bandpass
+
+;#grid_density: determines how accurately the filter will be constructed.
+;The minimum value is 16; higher values are slower to compute the filter.
+InputFilter.grid_density=16
+
+;#The following options are used only in Freq_Xlating_Fir_Filter implementation.
+;#InputFilter.IF is the intermediate frequency (in Hz) shifted down to zero Hz
+
+InputFilter.sampling_frequency=4000000
+InputFilter.IF=0
+
+
+
+;######### RESAMPLER CONFIG ############
+;## Resamples the input data. 
+
+;#implementation: Use [Pass_Through] or [Direct_Resampler]
+;#[Pass_Through] disables this block
+;#[Direct_Resampler] enables a resampler that implements a nearest neigbourhood interpolation
+Resampler.implementation=Direct_Resampler
+;Resampler.implementation=Pass_Through
+
+;#dump: Dump the resamplered data to a file.
+Resampler.dump=false
+;#dump_filename: Log path and filename.
+Resampler.dump_filename=../data/resampler.dat
+
+;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
+Resampler.item_type=gr_complex
+
+;#sample_freq_in: the sample frequency of the input signal
+Resampler.sample_freq_in=8000000
+
+;#sample_freq_out: the desired sample frequency of the output signal
+Resampler.sample_freq_out=2000000
+
+
+;######### CHANNELS GLOBAL CONFIG ############
+;#count: Number of available satellite channels.
+Channels.count=2
+;#in_acquisition: Number of channels simultaneously acquiring
+Channels.in_acquisition=1
+
+;######### CHANNEL 0 CONFIG ############
+;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
+;#if the option is disabled by default is assigned GPS
+Channel0.system=Galileo
+
+;#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=1B
+
+;#satellite: Satellite PRN ID for this channel. Disable this option to random search
+Channel0.satellite=11
+Channel0.repeat_satellite=true
+
+;######### CHANNEL 1 CONFIG ############
+
+Channel1.system=Galileo
+Channel1.signal=1B
+Channel1.satellite=12
+Channel1.repeat_satellite=true
+
+;######### CHANNEL 2 CONFIG ############
+
+Channel2.system=GPS
+Channel2.signal=1C
+;Channel2.satellite=16
+Channel2.repeat_satellite=false
+
+;######### CHANNEL 3 CONFIG ############
+
+Channel3.system=GPS
+Channel3.signal=1C
+;Channel3.satellite=21
+Channel3.repeat_satellite=false
+
+;######### CHANNEL 4 CONFIG ############
+
+Channel4.system=GPS
+Channel4.signal=1C
+;Channel4.satellite=3
+Channel4.repeat_satellite=false
+
+;######### CHANNEL 5 CONFIG ############
+
+Channel5.system=GPS
+Channel5.signal=1C
+;Channel5.satellite=21
+;Channel5.repeat_satellite=false
+
+;######### CHANNEL 6 CONFIG ############
+
+Channel6.system=GPS
+Channel6.signal=1C
+;Channel6.satellite=21
+;Channel6.repeat_satellite=false
+
+;######### CHANNEL 7 CONFIG ############
+
+Channel7.system=GPS
+Channel7.signal=1C
+;Channel7.satellite=21
+;Channel7.repeat_satellite=false
+
+;######### ACQUISITION GLOBAL CONFIG ############
+
+;#dump: Enable or disable the acquisition internal data file logging [true] or [false] 
+Acquisition.dump=false
+;#filename: Log path and filename
+Acquisition.dump_filename=./acq_dump.dat
+;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
+Acquisition.item_type=gr_complex
+;#if: Signal intermediate frequency in [Hz] 
+Acquisition.if=0
+;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
+Acquisition.sampled_ms=4
+
+;######### ACQUISITION CHANNELS CONFIG ######
+
+;######### ACQUISITION CH 0 CONFIG ############
+;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
+Acquisition0.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
+;#threshold: Acquisition threshold
+Acquisition0.threshold=50
+;#doppler_max: Maximum expected Doppler shift [Hz]
+Acquisition0.doppler_max=10000
+;#doppler_max: Doppler step in the grid search [Hz]
+Acquisition0.doppler_step=125
+;#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]
+Acquisition0.cboc=true
+
+;######### ACQUISITION CH 1 CONFIG ############
+Acquisition1.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
+Acquisition1.threshold=50
+Acquisition1.doppler_max=10000
+Acquisition1.doppler_step=125
+Acquisition1.cboc=true
+
+
+;######### ACQUISITION CH 2 CONFIG ############
+Acquisition2.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition2.threshold=50
+Acquisition2.doppler_max=12000
+Acquisition2.doppler_step=250
+
+
+;######### ACQUISITION CH 3 CONFIG ############
+Acquisition3.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition3.threshold=50
+Acquisition3.doppler_max=12000
+Acquisition3.doppler_step=250
+
+
+;######### ACQUISITION CH 4 CONFIG ############
+Acquisition4.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition4.threshold=50
+Acquisition4.doppler_max=12000
+Acquisition4.doppler_step=250
+
+
+;######### ACQUISITION CH 5 CONFIG ############
+Acquisition5.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition5.threshold=50
+Acquisition5.doppler_max=12000
+Acquisition5.doppler_step=250
+
+
+;######### ACQUISITION CH 6 CONFIG ############
+Acquisition6.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition6.threshold=50
+Acquisition6.doppler_max=12000
+Acquisition6.doppler_step=250
+
+
+;######### ACQUISITION CH 7 CONFIG ############
+Acquisition7.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition7.threshold=50
+Acquisition7.doppler_max=12000
+Acquisition7.doppler_step=250
+
+
+;######### ACQUISITION CH 8 CONFIG ############
+Acquisition8.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition8.threshold=70
+Acquisition8.doppler_max=10000
+Acquisition8.doppler_step=250
+
+
+
+;######### 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]
+Tracking.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.item_type=gr_complex
+
+;#sampling_frequency: Signal Intermediate Frequency in [Hz] 
+Tracking.if=0
+
+;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false] 
+Tracking.dump=true
+
+;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
+Tracking.dump_filename=../data/veml_tracking_ch_
+
+;#pll_bw_hz: PLL loop filter bandwidth [Hz]
+Tracking.pll_bw_hz=30.0;
+
+;#dll_bw_hz: DLL loop filter bandwidth [Hz]
+Tracking.dll_bw_hz=2.0;
+
+;#fll_bw_hz: FLL loop filter bandwidth [Hz]
+Tracking.fll_bw_hz=10.0;
+
+;#order: PLL/DLL loop filter order [2] or [3]
+Tracking.order=3;
+
+;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] for GPS and [0.15] for Galileo
+Tracking.early_late_space_chips=0.15;
+
+;#very_early_late_space_chips: only for [Galileo_E1_DLL_PLL_VEML_Tracking], correlator very early-late space [chips]. Use [0.6]
+Tracking.very_early_late_space_chips=0.6;
+
+;######### TELEMETRY DECODER CONFIG ############
+;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A.
+TelemetryDecoder.implementation=GPS_L1_CA_Telemetry_Decoder
+TelemetryDecoder.dump=false
+
+;######### OBSERVABLES CONFIG ############
+;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+Observables.implementation=GPS_L1_CA_Observables
+
+;#dump: Enable or disable the Observables internal binary data file logging [true] or [false] 
+Observables.dump=false
+
+;#dump_filename: Log path and filename.
+Observables.dump_filename=./observables.dat
+
+
+;######### PVT CONFIG ############
+;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
+PVT.implementation=GPS_L1_CA_PVT
+
+;#averaging_depth: Number of PVT observations in the moving average algorithm
+PVT.averaging_depth=100
+
+;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false] 
+PVT.flag_averaging=true
+
+;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
+PVT.output_rate_ms=100;
+
+;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms<=display_rate_ms.
+PVT.display_rate_ms=500;
+
+;#dump: Enable or disable the PVT internal binary data file logging [true] or [false] 
+PVT.dump=false
+
+;#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
+
+;######### OUTPUT_FILTER CONFIG ############
+;# Receiver output filter: Leave this block disabled in this version
+OutputFilter.implementation=Null_Sink_Output_Filter
+OutputFilter.filename=data/gnss-sdr.dat
+OutputFilter.item_type=gr_complex

src/core/receiver/gnss_block_factory.cc

@@ -54,9 +54,11 @@
 #include "fir_filter.h"
 #include "freq_xlating_fir_filter.h"
 #include "gps_l1_ca_pcps_acquisition.h"
+#include "galileo_e1_pcps_ambiguous_acquisition.h"
 #include "gps_l1_ca_dll_pll_tracking.h"
 #include "gps_l1_ca_dll_fll_pll_tracking.h"
 #include "gps_l1_ca_tcp_connector_tracking.h"
+#include "galileo_e1_dll_pll_veml_tracking.h"
 #include "gps_l1_ca_telemetry_decoder.h"
 #include "gps_l1_ca_observables.h"
 #include "gps_l1_ca_pvt.h"
@@ -337,6 +339,11 @@ GNSSBlockInterface* GNSSBlockFactory::GetBlock(
             block = new GpsL1CaPcpsAcquisition(configuration, role, in_streams,
                     out_streams, queue);
         }
+    else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0)
+        {
+            block = new GalileoE1PcpsAmbiguousAcquisition(configuration, role, in_streams,
+                    out_streams, queue);
+        }
 
     // TRACKING BLOCKS -------------------------------------------------------------
 
@@ -355,6 +362,11 @@ GNSSBlockInterface* GNSSBlockFactory::GetBlock(
                 block = new GpsL1CaTcpConnectorTracking(configuration, role, in_streams,
                         out_streams, queue);
             }
+    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
+            {
+                block = new GalileoE1DllPllVemlTracking(configuration, role, in_streams,
+                        out_streams, queue);
+            }
 
     // TELEMETRY DECODERS ----------------------------------------------------------
 

src/core/receiver/gnss_flowgraph.cc

@@ -521,7 +521,7 @@ void GNSSFlowgraph::init()
 void GNSSFlowgraph::set_signals_list()
 {
     /*
-     * Sets a sequential list of satellites (1...32)
+     * Sets a sequential list of satellites (1, 2, ...32)
      */
 
     /*
@@ -532,7 +532,7 @@ void GNSSFlowgraph::set_signals_list()
             11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28,
             29, 30, 31, 32 };
 
-    std::set<unsigned int>::iterator available_gps_prn_iter;
+    std::set<unsigned int>::iterator available_gnss_prn_iter;
 
     Gnss_Signal signal_value;
 
@@ -541,11 +541,25 @@ void GNSSFlowgraph::set_signals_list()
      * To add signals from other systems, add another loop 'for'
      */
 
-    for (available_gps_prn_iter = available_gps_prn.begin(); available_gps_prn_iter
+    for (available_gnss_prn_iter = available_gps_prn.begin(); available_gnss_prn_iter
-    != available_gps_prn.end(); available_gps_prn_iter++)
+    != available_gps_prn.end(); available_gnss_prn_iter++)
         {
             signal_value = Gnss_Signal(Gnss_Satellite(std::string("GPS"),
-                    *available_gps_prn_iter), std::string("1C"));
+                    *available_gnss_prn_iter), std::string("1C"));
+            available_GNSS_signals_.push_back(signal_value);
+        }
+
+    std::set<unsigned int> available_galileo_prn = { 11, 12 };
+
+
+    for (available_gnss_prn_iter = available_galileo_prn.begin(); available_gnss_prn_iter
+    != available_galileo_prn.end(); available_gnss_prn_iter++)
+        {
+            signal_value = Gnss_Signal(Gnss_Satellite(std::string("Galileo"),
+                    *available_gnss_prn_iter), std::string("1B"));
+            available_GNSS_signals_.push_back(signal_value);
+            signal_value = Gnss_Signal(Gnss_Satellite(std::string("Galileo"),
+                    *available_gnss_prn_iter), std::string("1C"));
             available_GNSS_signals_.push_back(signal_value);
         }
 
@@ -578,12 +592,12 @@ void GNSSFlowgraph::set_signals_list()
                 }
 
         }
-    /*	std::cout << "Signal queue: " << std::endl;
+    	std::cout << "Signal queue: " << std::endl;
 	 for (std::list<Gnss_Signal>::iterator it =
 	 available_GNSS_signals_.begin(); it
 	 != available_GNSS_signals_.end(); it++) {
 	 std::cout << *it << std::endl;
-	 }*/
+	 }
 
 }
 

src/main/jamfile.jam

@@ -53,9 +53,11 @@ exe gnss-sdr : main.cc
 ../algorithms/tracking/adapters//gps_l1_ca_dll_pll_tracking
 ../algorithms/tracking/adapters//gps_l1_ca_dll_fll_pll_tracking
 ../algorithms/tracking/adapters//gps_l1_ca_tcp_connector_tracking
+../algorithms/tracking/adapters//galileo_e1_dll_pll_veml_tracking
 ../algorithms/tracking/gnuradio_blocks//gps_l1_ca_dll_pll_tracking_cc
 ../algorithms/tracking/gnuradio_blocks//gps_l1_ca_dll_fll_pll_tracking_cc
 ../algorithms/tracking/gnuradio_blocks//gps_l1_ca_tcp_connector_tracking_cc
+../algorithms/tracking/gnuradio_blocks//galileo_e1_dll_pll_veml_tracking_cc
 ../algorithms/tracking/libs//tracking_discriminators
 ../algorithms/tracking/libs//CN_estimators
 ../algorithms/tracking/libs//tracking_FLL_PLL_filter

src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc

@@ -111,7 +111,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::init(){
 	config->set_property("Acquisition.doppler_max", "10000");
 	config->set_property("Acquisition.doppler_step", "125");
 	config->set_property("Acquisition.repeat_satellite", "false");
-	config->set_property("Acquisition1.cboc", "true");
+	config->set_property("Acquisition0.cboc", "true");
 }
 
 void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::start_queue()
@@ -142,6 +142,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoCTest, Instantiate)
 	init();
 
 	GalileoE1PcpsAmbiguousAcquisition *acquisition = new GalileoE1PcpsAmbiguousAcquisition(config, "Acquisition", 1, 1, queue);
+    EXPECT_STREQ("Galileo_E1_PCPS_Ambiguous_Acquisition", acquisition->implementation().c_str());
 
 	delete acquisition;
 

src/tests/gnss_block/gnss_block_factory_test.cc

@@ -227,6 +227,24 @@ TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaPcpsAcquisition) {
 	delete acquisition;
 }
 
+TEST(GNSS_Block_Factory_Test, InstantiateGalileoE1PcpsAmbiguousAcquisition) {
+    InMemoryConfiguration *configuration = new InMemoryConfiguration();
+
+    configuration->set_property("Acquisition.implementation", "Galileo_E1_PCPS_Ambiguous_Acquisition");
+
+    gr_msg_queue_sptr queue = gr_make_msg_queue(0);
+
+    GNSSBlockFactory *factory = new GNSSBlockFactory();
+    AcquisitionInterface *acquisition = (AcquisitionInterface*)factory->GetBlock(configuration, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1, queue);
+
+
+    EXPECT_STREQ("Acquisition", acquisition->role().c_str());
+    EXPECT_STREQ("Galileo_E1_PCPS_Ambiguous_Acquisition", acquisition->implementation().c_str());
+
+    delete configuration;
+    delete factory;
+    delete acquisition;
+}
 TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaDllFllPllTracking) {
 	InMemoryConfiguration *configuration = new InMemoryConfiguration();
 
@@ -284,6 +302,25 @@ TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaTcpConnectorTracking) {
 	delete tracking;
 }
 
+TEST(GNSS_Block_Factory_Test, InstantiateGalileoE1DllPllVemlTracking) {
+    InMemoryConfiguration *configuration = new InMemoryConfiguration();
+
+    configuration->set_property("Tracking.implementation", "Galileo_E1_DLL_PLL_VEML_Tracking");
+
+    gr_msg_queue_sptr queue = gr_make_msg_queue(0);
+
+    GNSSBlockFactory *factory = new GNSSBlockFactory();
+    TrackingInterface *tracking = (TrackingInterface*)factory->GetBlock(configuration, "Tracking", "Galileo_E1_DLL_PLL_VEML_Tracking", 1, 1, queue);
+
+
+    EXPECT_STREQ("Tracking", tracking->role().c_str());
+    EXPECT_STREQ("Galileo_E1_DLL_PLL_VEML_Tracking", tracking->implementation().c_str());
+
+    delete configuration;
+    delete factory;
+    delete tracking;
+}
+
 TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaTelemetryDecoder) {
 	InMemoryConfiguration *configuration = new InMemoryConfiguration();