Simulink tracking block updated: generation of the Simulink model from a script MATLAB and improvement of the tracking algorithm (both PLL and DLL). Added multi-threading support for MATLAB.

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

conf/gnss-sdr_tcp_connector_tracking.conf

@@ -9,7 +9,7 @@ GNSS-SDR.internal_fs_hz=4000000
 ControlThread.wait_for_flowgraph=false
 
 ;######### SIGNAL_SOURCE CONFIG ############
-;#implementation: Use only File_Signal_Source in this version
+;#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
@@ -20,6 +20,7 @@ SignalSource.item_type=gr_complex
 
 ;#sampling_frequency: Original Signal sampling frequency in [Hz] 
 SignalSource.sampling_frequency=4000000
+;SignalSource.sampling_frequency=100000000
 
 ;#freq: RF front-end center frequency in [Hz] 
 SignalSource.freq=1575420000
@@ -32,10 +33,6 @@ SignalSource.subdevice=B:0
 
 ;#samples: Number of samples to be processed. Notice that 0 indicates the entire file.
 SignalSource.samples=0
-;SignalSource.samples=80000000
-;SignalSource.samples=40000000
-;SignalSource.samples=20000000
-
 
 ;#repeat: Repeat the processing file. Disable this option in this version
 SignalSource.repeat=false
@@ -43,10 +40,15 @@ SignalSource.repeat=false
 ;#dump: Dump the Signal source data to a file. Disable this option in this version
 SignalSource.dump=false
 
+SignalSource.dump_filename=../data/signal_source.dat
+
+SignalSource.dump_filename=../data/SignalSource.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: Pass_Through disables this block
@@ -68,7 +70,7 @@ InputFilter.implementation=Pass_Through
 InputFilter.dump=false
 
 ;#dump_filename: Log path and filename.
-InputFilter.dump=../data/input_filter.dat
+InputFilter.dump_filename=../data/input_filter.dat
 
 ;#The following options are used in the filter design of Fir_Filter implementation. 
 ;#These options are based on parameters of gnuradio's function: gr_remez.
@@ -142,8 +144,8 @@ Resampler.sample_freq_out=4000000
 
 ;######### CHANNELS GLOBAL CONFIG ############
 ;#count: Number of available satellite channels.
-Channels.count=8
-Channels.in_acquisition=8
+Channels.count=7
+Channels.in_acquisition=7
 
 ;######### CHANNEL 0 CONFIG ############
 ;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
@@ -210,42 +212,55 @@ Channel0.system=GPS
 Channel0.signal=1C
 
 ;#satellite: Satellite PRN ID for this channel. Disable this option to random search
-;Channel0.satellite=2
+;Channel0.satellite=15
+;Channel0.repeat_satellite=true
 
 ;######### CHANNEL 1 CONFIG ############
 
 Channel1.system=GPS
 Channel1.signal=1C
-;Channel1.satellite=14
+;Channel1.satellite=18
+;Channel1.repeat_satellite=true
 
 ;######### CHANNEL 2 CONFIG ############
 
 Channel2.system=GPS
 Channel2.signal=1C
-;Channel2.satellite=21
+;Channel2.satellite=16
+;Channel2.repeat_satellite=true
 
 ;######### CHANNEL 3 CONFIG ############
 
 Channel3.system=GPS
 Channel3.signal=1C
-;Channel3.satellite=13
+;Channel3.satellite=23
+;Channel3.repeat_satellite=true
+
+;######### CHANNEL 4 CONFIG ############
+
+Channel4.system=GPS
+Channel4.signal=1C
+;Channel4.satellite=3
+;Channel4.repeat_satellite=true
+
+;######### CHANNEL 3 CONFIG ############
+
+Channel5.system=GPS
+Channel5.signal=1C
+;Channel5.satellite=21
+;Channel5.repeat_satellite=true
 
 
 ;######### 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=1
 
@@ -254,74 +269,77 @@ Acquisition.sampled_ms=1
 ;######### ACQUISITION CH 0 CONFIG ############
 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition]
 Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition
-
 ;#threshold: Acquisition threshold
-Acquisition0.threshold=70
-
+Acquisition0.threshold=100
 ;#doppler_max: Maximum expected Doppler shift [Hz]
 Acquisition0.doppler_max=10000
-
 ;#doppler_max: Doppler step in the grid search [Hz]
 Acquisition0.doppler_step=250
+;#repeat_satellite: Use only jointly with the satellite PRN ID option. 
 
-;#repeat_satellite: Use only jointly with the satellte PRN ID option. 
-;#Enable repeat_satellite to keep searching the same satellite during the runtime.
-;Acquisition0.repeat_satellite=true
 
 ;######### ACQUISITION CH 1 CONFIG ############
 Acquisition1.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition1.threshold=70
+Acquisition1.threshold=100
 Acquisition1.doppler_max=10000
 Acquisition1.doppler_step=250
-;Acquisition1.repeat_satellite=true
+
 
 ;######### ACQUISITION CH 2 CONFIG ############
 Acquisition2.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition2.threshold=70
+Acquisition2.threshold=100
 Acquisition2.doppler_max=10000
 Acquisition2.doppler_step=250
-;Acquisition2.repeat_satellite=true
+
 
 ;######### ACQUISITION CH 3 CONFIG ############
 Acquisition3.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition3.threshold=70
+Acquisition3.threshold=100
 Acquisition3.doppler_max=10000
 Acquisition3.doppler_step=250
-;Acquisition3.repeat_satellite=true
+
 
 ;######### ACQUISITION CH 4 CONFIG ############
 Acquisition4.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition4.threshold=70
+Acquisition4.threshold=100
 Acquisition4.doppler_max=10000
 Acquisition4.doppler_step=250
-;Acquisition4.repeat_satellite=true
+
 
 ;######### ACQUISITION CH 5 CONFIG ############
 Acquisition5.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition5.threshold=70
+Acquisition5.threshold=100
 Acquisition5.doppler_max=10000
 Acquisition5.doppler_step=250
-;Acquisition5.repeat_satellite=true
+
 
 ;######### ACQUISITION CH 6 CONFIG ############
 Acquisition6.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition6.threshold=70
+Acquisition6.threshold=100
 Acquisition6.doppler_max=10000
 Acquisition6.doppler_step=250
-;Acquisition6.repeat_satellite=true
+
 
 ;######### ACQUISITION CH 7 CONFIG ############
 Acquisition7.implementation=GPS_L1_CA_PCPS_Acquisition
-Acquisition7.threshold=70
+Acquisition7.threshold=100
 Acquisition7.doppler_max=10000
 Acquisition7.doppler_step=250
-;Acquisition7.repeat_satellite=true
+
+
+;######### ACQUISITION CH 8 CONFIG ############
+Acquisition8.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition8.threshold=100
+Acquisition8.doppler_max=10000
+Acquisition8.doppler_step=250
+
+
 
 ;######### TRACKING GLOBAL CONFIG ############
 
 ;#implementatiion: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking], [GPS_L1_CA_DLL_FLL_PLL_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking]
-Tracking.implementation=GPS_L1_CA_TCP_CONNECTOR_Tracking
-
+Tracking.implementation= GPS_L1_CA_TCP_CONNECTOR_Tracking
+;Tracking.implementation=GPS_L1_CA_DLL_FLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
 Tracking.item_type=gr_complex
 
@@ -341,7 +359,7 @@ Tracking.pll_bw_hz=50.0;
 Tracking.dll_bw_hz=2.0;
 
 ;#fll_bw_hz: FLL loop filter bandwidth [Hz]
-Tracking.fll_bw_hz=20.0;
+Tracking.fll_bw_hz=10.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
 Tracking.order=2;
@@ -350,19 +368,17 @@ Tracking.order=2;
 Tracking.early_late_space_chips=0.5;
 
 ;#port_ch0: local TCP port for channel 0
-Tracking.port_ch0=2060;
+Tracking.port_ch0=2070;
 
 ;######### 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
 
-;#output_rate_ms: Period between two psudoranges outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
-Observables.output_rate_ms=100
-
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false] 
 Observables.dump=false
 
@@ -375,11 +391,18 @@ Observables.dump_filename=./observables.dat
 PVT.implementation=GPS_L1_CA_PVT
 
 ;#averaging_depth: Number of PVT observations in the moving average algorithm
+;PVT.averaging_depth=100
 PVT.averaging_depth=2
 
 ;#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