[hamradio-commits] [gnss-sdr] 135/236: Bug fix in Hybrid PVT date/time computation. Removed the obsolete GPS L1 Optim tracking block
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Tue Apr 26 16:02:44 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 d15066fda6bb2dc121936fc855d85ce7d9c454d5
Author: Javier Arribas <javiarribas at gmail.com>
Date: Tue Mar 29 18:40:00 2016 +0200
Bug fix in Hybrid PVT date/time computation. Removed the obsolete GPS L1 Optim tracking block
---
conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf | 1 -
conf/gnss-sdr_GPS_L1_USRP_realtime.conf | 2 +-
conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf | 283 ---------
conf/gnss-sdr_GPS_L1_ishort.conf | 87 +++
conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf | 2 +-
conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf | 2 +-
src/algorithms/PVT/libs/hybrid_ls_pvt.cc | 9 +-
src/algorithms/tracking/adapters/CMakeLists.txt | 1 -
.../adapters/gps_l1_ca_dll_pll_optim_tracking.cc | 159 -----
.../adapters/gps_l1_ca_dll_pll_optim_tracking.h | 119 ----
.../tracking/gnuradio_blocks/CMakeLists.txt | 1 -
.../gps_l1_ca_dll_pll_optim_tracking_cc.cc | 654 ---------------------
.../gps_l1_ca_dll_pll_optim_tracking_cc.h | 181 ------
src/core/receiver/gnss_block_factory.cc | 13 -
14 files changed, 95 insertions(+), 1419 deletions(-)
diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
index dfac848..17d1ad4 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
@@ -299,7 +299,6 @@ 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]
-;Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Optim_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
diff --git a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
index d52ce19..7f0ce90 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
@@ -299,7 +299,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]
-Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Optim_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
diff --git a/conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf b/conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf
deleted file mode 100644
index 6462bc4..0000000
--- a/conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf
+++ /dev/null
@@ -1,283 +0,0 @@
-; 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=4000000
-
-;######### 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=../data/agilent_cap2.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=4000000
-
-;#freq: RF front-end center frequency in [Hz]
-SignalSource.freq=1575420000
-
-;#samples: Number of samples to be processed. Notice that 0 indicates the entire file.
-SignalSource.samples=250000000
-
-;#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=4000000
-
-_1C
-;######### CHANNELS GLOBAL CONFIG ############
-;#count: Number of available GPS satellite channels.
-Channels_1C.count=8
-;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
-Channels.in_acquisition=1
-;#signal:
-;#if the option is disabled by default is assigned "1C" GPS L1 C/A
-Channel.signal=1C
-
-
-;######### ACQUISITION GLOBAL CONFIG ############
-;#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]
-Acquisition_1C.if=0
-;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_1C.sampled_ms=1
-;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
-;#threshold: Acquisition threshold
-Acquisition_1C.threshold=0.008
-;#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.01
-;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_1C.doppler_max=10000
-;#doppler_max: Doppler step in the grid search [Hz]
-Acquisition_1C.doppler_step=500
-
-
-
-;######### TRACKING GLOBAL CONFIG ############
-;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_FLL_PLL_Tracking]
-Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Optim_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]
-Tracking_1C.if=0
-
-;#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.
-Tracking_1C.dump_filename=./tracking_ch_
-
-;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_1C.pll_bw_hz=50.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;
-
-;#early_late_space_chips: correlator early-late space [chips]. Use [0.5]
-Tracking_1C.early_late_space_chips=0.5;
-
-;######### TELEMETRY DECODER GPS CONFIG ############
-;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
-TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
-TelemetryDecoder_1C.dump=false
-;#decimation factor
-TelemetryDecoder_1C.decimation_factor=1;
-
-;######### 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=false
-
-;#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=10
-
-;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms<=display_rate_ms.
-PVT.display_rate_ms=500
-
-;# KML, GeoJSON, NMEA and RTCM output configuration
-
-;#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
-
-;#nmea_dump_filename: NMEA log path and filename
-PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
-
-;#flag_nmea_tty_port: Enable or disable the NMEA log to a serial TTY port (Can be used with real hardware or virtual one)
-PVT.flag_nmea_tty_port=false;
-
-;#nmea_dump_devname: serial device descriptor for NMEA logging
-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
-
-;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
-PVT.dump=true
-
-;######### 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
diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf
new file mode 100644
index 0000000..bbea100
--- /dev/null
+++ b/conf/gnss-sdr_GPS_L1_ishort.conf
@@ -0,0 +1,87 @@
+; 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=4000000
+
+;######### CONTROL_THREAD CONFIG ############
+ControlThread.wait_for_flowgraph=false
+
+;######### SIGNAL_SOURCE CONFIG ############
+SignalSource.implementation=File_Signal_Source
+SignalSource.filename=/media/javier/SISTEMA/signals/test gestalt 22_1_2016/signal_source_gr_complex_4MSPS.dat
+SignalSource.item_type=gr_complex
+SignalSource.sampling_frequency=4000000
+SignalSource.freq=1575420000
+SignalSource.samples=250000000
+SignalSource.repeat=false
+SignalSource.dump=false
+SignalSource.dump_filename=../data/signal_source.dat
+SignalSource.enable_throttle_control=false
+
+
+;######### SIGNAL_CONDITIONER CONFIG ############
+SignalConditioner.implementation=Pass_Through
+
+
+;######### CHANNELS GLOBAL CONFIG ############
+Channels_1C.count=8
+Channels.in_acquisition=1
+Channel.signal=1C
+
+
+;######### ACQUISITION GLOBAL CONFIG ############
+Acquisition_1C.dump=false
+Acquisition_1C.dump_filename=./acq_dump.dat
+Acquisition_1C.item_type=gr_complex
+Acquisition_1C.if=0
+Acquisition_1C.sampled_ms=1
+Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition_1C.threshold=0.006
+;Acquisition_1C.pfa=0.01
+Acquisition_1C.doppler_max=10000
+Acquisition_1C.doppler_step=500
+
+;######### TRACKING GLOBAL CONFIG ############
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
+Tracking_1C.item_type=gr_complex
+Tracking_1C.if=0
+Tracking_1C.dump=false
+Tracking_1C.dump_filename=../data/epl_tracking_ch_
+Tracking_1C.pll_bw_hz=45.0;
+Tracking_1C.dll_bw_hz=2.0;
+Tracking_1C.order=3;
+
+;######### TELEMETRY DECODER GPS CONFIG ############
+TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
+TelemetryDecoder_1C.dump=false
+TelemetryDecoder_1C.decimation_factor=1;
+
+;######### OBSERVABLES CONFIG ############
+Observables.implementation=GPS_L1_CA_Observables
+Observables.dump=false
+Observables.dump_filename=./observables.dat
+
+
+;######### PVT CONFIG ############
+PVT.implementation=GPS_L1_CA_PVT
+PVT.averaging_depth=100
+PVT.flag_averaging=false
+PVT.output_rate_ms=10
+PVT.display_rate_ms=500
+PVT.dump_filename=./PVT
+PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
+PVT.flag_nmea_tty_port=false;
+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
+PVT.dump=false
+
+;######### OUTPUT_FILTER CONFIG ############
+OutputFilter.implementation=Null_Sink_Output_Filter
+OutputFilter.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
index a9f6200..1e3d3b3 100644
--- a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
@@ -210,7 +210,7 @@ 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]
-Tracking_1C.implementation=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.
Tracking_1C.item_type=gr_complex
diff --git a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
index 296e542..181ec89 100644
--- a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
@@ -104,7 +104,7 @@ Acquisition_1C.max_dwells=15
;######### TRACKING GLOBAL CONFIG ############
-Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Optim_Tracking
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
Tracking_1C.item_type=gr_complex
Tracking_1C.if=0
Tracking_1C.dump=false
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
index f3892bc..53ce940 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
@@ -60,7 +60,7 @@ hybrid_ls_pvt::hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
LOG(INFO) << "PVT lib dump enabled Log file: " << d_dump_filename.c_str();
}
- catch (std::ifstream::failure e)
+ catch (const std::ifstream::failure &e)
{
LOG(WARNING) << "Exception opening PVT lib dump file " << e.what();
}
@@ -98,8 +98,8 @@ bool hybrid_ls_pvt::get_PVT(std::map<int,Gnss_Synchro> gnss_pseudoranges_map, do
int GPS_week = 0;
double utc = 0.0;
double GST = 0.0;
- double utc_tx_corrected = 0.0; //utc computed at tx_time_corrected, added for Galileo constellation (in GPS utc is directly computed at TX_time_corrected_s)
- double TX_time_corrected_s;
+ //double utc_tx_corrected = 0.0; //utc computed at tx_time_corrected, added for Galileo constellation (in GPS utc is directly computed at TX_time_corrected_s)
+ double TX_time_corrected_s = 0.0;
double SV_clock_bias_s = 0.0;
d_flag_averaging = flag_averaging;
@@ -251,7 +251,8 @@ bool hybrid_ls_pvt::get_PVT(std::map<int,Gnss_Synchro> gnss_pseudoranges_map, do
utc = gps_utc_model.utc_time(TX_time_corrected_s, GPS_week);
}
// get time string Gregorian calendar
- boost::posix_time::time_duration t = boost::posix_time::seconds(utc);
+ double secondsperweek = 604800.0; // number of seconds in one week (7*24*60*60)
+ boost::posix_time::time_duration t = boost::posix_time::seconds(utc + secondsperweek * static_cast<double>(GPS_week));
// 22 August 1999 00:00 last Galileo start GST epoch (ICD sec 5.1.2)
boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
d_position_UTC_time = p_time;
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index c02bdde..3d146f6 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -25,7 +25,6 @@ set(TRACKING_ADAPTER_SOURCES
galileo_e1_dll_pll_veml_tracking.cc
galileo_e1_tcp_connector_tracking.cc
gps_l1_ca_dll_fll_pll_tracking.cc
- gps_l1_ca_dll_pll_optim_tracking.cc
gps_l1_ca_dll_pll_tracking.cc
gps_l1_ca_dll_pll_c_aid_tracking.cc
gps_l1_ca_tcp_connector_tracking.cc
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
deleted file mode 100644
index 14cf004..0000000
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
+++ /dev/null
@@ -1,159 +0,0 @@
-/*!
- * \file gps_l1_ca_dll_pll_optim_tracking.cc
- * \brief Interface of an adapter of a speed optimized DLL+PLL tracking loop block
- * for GPS L1 C/A to a TrackingInterface
- * \author Javier Arribas, 2012. jarribas(at)cttc.es
- *
- * GPS L1 TRACKING MODULE OPTIMIZED FOR SPEED:
- * - Code Doppler is not compensated in the local replica
- * Code DLL + carrier PLL according to the algorithms described in:
- * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
- * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#include "gps_l1_ca_dll_pll_optim_tracking.h"
-#include <cmath>
-#include <glog/logging.h>
-#include "GPS_L1_CA.h"
-#include "configuration_interface.h"
-
-using google::LogMessage;
-
-GpsL1CaDllPllOptimTracking::GpsL1CaDllPllOptimTracking(
- ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
-{
- DLOG(INFO) << "role " << role;
- //################# CONFIGURATION PARAMETERS ########################
- int fs_in;
- int vector_length;
- int f_if;
- bool dump;
- std::string dump_filename;
- std::string item_type;
- std::string default_item_type = "gr_complex";
- float pll_bw_hz;
- float dll_bw_hz;
- float early_late_space_chips;
- item_type = configuration->property(role + ".item_type",default_item_type);
- //vector_length = configuration->property(role + ".vector_length", 2048);
- fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
- f_if = configuration->property(role + ".if", 0);
- dump = configuration->property(role + ".dump", false);
- pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
- dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
- early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
- std::string default_dump_filename = "./track_ch";
- dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused!
- vector_length = round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
-
- //################# MAKE TRACKING GNURadio object ###################
- if (item_type.compare("gr_complex") == 0)
- {
- item_size_ = sizeof(gr_complex);
- tracking_ = gps_l1_ca_dll_pll_make_optim_tracking_cc(
- f_if,
- fs_in,
- vector_length,
- queue_,
- dump,
- dump_filename,
- pll_bw_hz,
- dll_bw_hz,
- early_late_space_chips);
- }
- else
- {
- item_size_ = sizeof(gr_complex);
- LOG(WARNING) << item_type << " unknown tracking item type.";
- }
-
- channel_ = 0;
- channel_internal_queue_ = 0;
- DLOG(INFO) << "tracking(" << tracking_->unique_id() << ")";
-}
-
-
-GpsL1CaDllPllOptimTracking::~GpsL1CaDllPllOptimTracking()
-{}
-
-
-void GpsL1CaDllPllOptimTracking::start_tracking()
-{
- tracking_->start_tracking();
-}
-
-/*
- * Set tracking channel unique ID
- */
-void GpsL1CaDllPllOptimTracking::set_channel(unsigned int channel)
-{
- channel_ = channel;
- tracking_->set_channel(channel);
-}
-
-/*
- * Set tracking channel internal queue
- */
-void GpsL1CaDllPllOptimTracking::set_channel_queue(
- concurrent_queue<int> *channel_internal_queue)
-{
- channel_internal_queue_ = channel_internal_queue;
- tracking_->set_channel_queue(channel_internal_queue_);
-}
-
-void GpsL1CaDllPllOptimTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
-{
- tracking_->set_gnss_synchro(p_gnss_synchro);
-}
-
-void GpsL1CaDllPllOptimTracking::connect(gr::top_block_sptr top_block)
-{
- if(top_block) { /* top_block is not null */};
- //nothing to connect, now the tracking uses gr_sync_decimator
-}
-
-void GpsL1CaDllPllOptimTracking::disconnect(gr::top_block_sptr top_block)
-{
- if(top_block) { /* top_block is not null */};
- //nothing to disconnect, now the tracking uses gr_sync_decimator
-}
-
-gr::basic_block_sptr GpsL1CaDllPllOptimTracking::get_left_block()
-{
- return tracking_;
-}
-
-gr::basic_block_sptr GpsL1CaDllPllOptimTracking::get_right_block()
-{
- return tracking_;
-}
-
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h
deleted file mode 100644
index e9254a2..0000000
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*!
- * \file gps_l1_ca_dll_pll_optim_tracking.h
- * \brief Interface of an adapter of a speed optimized DLL+PLL tracking loop block
- * for GPS L1 C/A to a TrackingInterface
- * \author Javier Arribas, 2012. jarribas(at)cttc.es
- *
- * GPS L1 TRACKING MODULE OPTIMIZED FOR SPEED:
- * - Code Doppler is not compensated in the local replica
- * Code DLL + carrier PLL according to the algorithms described in:
- * K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
- * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_H_
-#define GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_H_
-
-#include <string>
-#include <gnuradio/msg_queue.h>
-#include "tracking_interface.h"
-#include "gps_l1_ca_dll_pll_optim_tracking_cc.h"
-
-
-class ConfigurationInterface;
-
-/*!
- * \brief This class implements a code DLL + carrier PLL tracking loop
- */
-class GpsL1CaDllPllOptimTracking : public TrackingInterface
-{
-
-public:
-
- GpsL1CaDllPllOptimTracking(ConfigurationInterface* configuration,
- std::string role,
- unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
-
- virtual ~GpsL1CaDllPllOptimTracking();
-
- std::string role()
- {
- return role_;
- }
-
- //! Returns "GPS_L1_CA_DLL_PLL_Optim_Tracking"
- std::string implementation()
- {
- return "GPS_L1_CA_DLL_PLL_Optim_Tracking";
- }
- size_t item_size()
- {
- return item_size_;
- }
-
- void connect(gr::top_block_sptr top_block);
- void disconnect(gr::top_block_sptr top_block);
- gr::basic_block_sptr get_left_block();
- gr::basic_block_sptr get_right_block();
-
-
- /*!
- * \brief Set tracking channel unique ID
- */
- void set_channel(unsigned int channel);
-
- /*!
- * \brief Set acquisition/tracking common Gnss_Synchro object pointer
- * to efficiently exchange synchronization data between acquisition and tracking blocks
- */
- void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
-
- /*!
- * \brief Set tracking channel internal queue
- */
- void set_channel_queue(concurrent_queue<int> *channel_internal_queue);
-
- void start_tracking();
-
-private:
-
- gps_l1_ca_dll_pll_optim_tracking_cc_sptr tracking_;
- size_t item_size_;
-
- unsigned int channel_;
-
- std::string role_;
- unsigned int in_streams_;
- unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
- concurrent_queue<int> *channel_internal_queue_;
-};
-
-#endif // GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_H_
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index d5bced4..3a583b7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -26,7 +26,6 @@ set(TRACKING_GR_BLOCKS_SOURCES
galileo_e1_dll_pll_veml_tracking_cc.cc
galileo_e1_tcp_connector_tracking_cc.cc
gps_l1_ca_dll_fll_pll_tracking_cc.cc
- gps_l1_ca_dll_pll_optim_tracking_cc.cc
gps_l1_ca_dll_pll_tracking_cc.cc
gps_l1_ca_tcp_connector_tracking_cc.cc
galileo_e5a_dll_pll_tracking_cc.cc
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
deleted file mode 100644
index 82be300..0000000
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
+++ /dev/null
@@ -1,654 +0,0 @@
-/*!
- * \file gps_l1_ca_dll_pll_optim_tracking_cc.cc
- * \brief Implementation of a code DLL + carrier PLL tracking block
- * \author Javier Arribas, 2012. jarribas(at)cttc.es
- * GPS L1 TRACKING MODULE OPTIMIZED FOR SPEED:
- * - Code Doppler is not compensated in the local replica
- * Code DLL + carrier PLL according to the algorithms described in:
- * [1] K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
- * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#include "gps_l1_ca_dll_pll_optim_tracking_cc.h"
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <volk/volk.h>
-#include "gps_sdr_signal_processing.h"
-#include "tracking_discriminators.h"
-#include "lock_detectors.h"
-#include "GPS_L1_CA.h"
-#include "nco_lib.h"
-#include "control_message_factory.h"
-
-
-
-/*!
- * \todo Include in definition header file
- */
-#define CN0_ESTIMATION_SAMPLES 20
-#define MINIMUM_VALID_CN0 25
-#define MAXIMUM_LOCK_FAIL_COUNTER 50
-#define CARRIER_LOCK_THRESHOLD 0.85
-
-using google::LogMessage;
-
-gps_l1_ca_dll_pll_optim_tracking_cc_sptr
-gps_l1_ca_dll_pll_make_optim_tracking_cc(
- long if_freq,
- long fs_in,
- unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
- bool dump,
- std::string dump_filename,
- float pll_bw_hz,
- float dll_bw_hz,
- float early_late_space_chips)
-{
- return gps_l1_ca_dll_pll_optim_tracking_cc_sptr(new Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc(if_freq,
- fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
-}
-
-
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::forecast (int noutput_items,
- gr_vector_int &ninput_items_required)
-{
- if (noutput_items != 0)
- {
- ninput_items_required[0] = d_gnuradio_forecast_samples; //set the required available samples in each call
- }
-}
-
-
-
-Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc(
- long if_freq,
- long fs_in,
- unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
- bool dump,
- std::string dump_filename,
- float pll_bw_hz,
- float dll_bw_hz,
- float early_late_space_chips) :
- gr::block("Gps_L1_Ca_Dll_Pll_Tracking_cc",
- gr::io_signature::make(1, 1, sizeof(gr_complex)),
- gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)))
-{
- // initialize internal vars
- d_queue = queue;
- d_dump = dump;
- d_if_freq = if_freq;
- d_fs_in = fs_in;
- d_vector_length = vector_length;
- d_gnuradio_forecast_samples = static_cast<int>(d_vector_length) * 2;
- d_dump_filename = dump_filename;
-
- // Initialize tracking ==========================================
- d_code_loop_filter.set_DLL_BW(dll_bw_hz);
- d_carrier_loop_filter.set_PLL_BW(pll_bw_hz);
-
- //--- DLL variables --------------------------------------------------------
- d_early_late_spc_chips = early_late_space_chips; // Define early-late offset (in chips)
-
- // Initialization of local code replica
- // Get space for a vector with the C/A code replica sampled 1x/chip
- d_ca_code = static_cast<gr_complex*>(volk_malloc((GPS_L1_CA_CODE_LENGTH_CHIPS + 2) * sizeof(gr_complex), volk_get_alignment()));
-
- // Get space for the resampled early / prompt / late local replicas
- d_early_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
- d_prompt_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
- d_late_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
-
- // space for carrier wipeoff and signal baseband vectors
- d_carr_sign = static_cast<gr_complex*>(volk_malloc(2*d_vector_length * sizeof(gr_complex), volk_get_alignment()));
-
- // correlator outputs (scalar)
- d_Early = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
- d_Prompt = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
- d_Late = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
-
- //--- Perform initializations ------------------------------
- // define initial code frequency basis of NCO
- d_code_freq_chips = GPS_L1_CA_CODE_RATE_HZ;
- // define residual code phase (in chips)
- d_rem_code_phase_samples = 0.0;
- // define residual carrier phase
- d_rem_carr_phase_rad = 0.0;
-
- // sample synchronization
- d_sample_counter = 0;
- //d_sample_counter_seconds = 0;
- d_acq_sample_stamp = 0;
-
- d_enable_tracking = false;
- d_pull_in = false;
- d_last_seg = 0;
-
- d_current_prn_length_samples = static_cast<int>(d_vector_length);
-
- // CN0 estimation and lock detector buffers
- d_cn0_estimation_counter = 0;
- d_Prompt_buffer = new gr_complex[CN0_ESTIMATION_SAMPLES];
- d_carrier_lock_test = 1;
- d_CN0_SNV_dB_Hz = 0;
- d_carrier_lock_fail_counter = 0;
- d_carrier_lock_threshold = CARRIER_LOCK_THRESHOLD;
-
- systemName["G"] = std::string("GPS");
-
- d_channel_internal_queue = 0;
- d_acquisition_gnss_synchro = 0;
- d_channel = 0;
- d_acq_code_phase_samples = 0.0;
- d_acq_carrier_doppler_hz = 0.0;
- d_carrier_doppler_hz = 0.0;
- d_acc_carrier_phase_rad = 0.0;
- d_code_phase_samples = 0.0;
- d_acc_code_phase_secs = 0.0;
-}
-
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::start_tracking()
-{
- // correct the code phase according to the delay between acq and trk
- d_acq_code_phase_samples = d_acquisition_gnss_synchro->Acq_delay_samples;
- d_acq_carrier_doppler_hz = d_acquisition_gnss_synchro->Acq_doppler_hz;
- d_acq_sample_stamp = d_acquisition_gnss_synchro->Acq_samplestamp_samples;
-
- long int acq_trk_diff_samples;
- double acq_trk_diff_seconds;
- acq_trk_diff_samples = static_cast<long int>(d_sample_counter) - static_cast<long int>(d_acq_sample_stamp); //-d_vector_length;
- LOG(INFO) << "Number of samples between Acquisition and Tracking =" << acq_trk_diff_samples;
- acq_trk_diff_seconds = static_cast<float>(acq_trk_diff_samples) / static_cast<float>(d_fs_in);
- //doppler effect
- // Fd=(C/(C+Vr))*F
- double radial_velocity;
- radial_velocity = (GPS_L1_FREQ_HZ + d_acq_carrier_doppler_hz) / GPS_L1_FREQ_HZ;
- // new chip and prn sequence periods based on acq Doppler
- double T_chip_mod_seconds;
- double T_prn_mod_seconds;
- double T_prn_mod_samples;
- d_code_freq_chips = radial_velocity * GPS_L1_CA_CODE_RATE_HZ;
- T_chip_mod_seconds = 1/d_code_freq_chips;
- T_prn_mod_seconds = T_chip_mod_seconds * GPS_L1_CA_CODE_LENGTH_CHIPS;
- T_prn_mod_samples = T_prn_mod_seconds * static_cast<float>(d_fs_in);
- d_current_prn_length_samples = round(T_prn_mod_samples);
-
- double T_prn_true_seconds = GPS_L1_CA_CODE_LENGTH_CHIPS / GPS_L1_CA_CODE_RATE_HZ;
- double T_prn_true_samples = T_prn_true_seconds * static_cast<float>(d_fs_in);
- double T_prn_diff_seconds = T_prn_true_seconds - T_prn_mod_seconds;
- double N_prn_diff = acq_trk_diff_seconds / T_prn_true_seconds;
- double corrected_acq_phase_samples, delay_correction_samples;
- corrected_acq_phase_samples = fmod((d_acq_code_phase_samples + T_prn_diff_seconds * N_prn_diff * static_cast<float>(d_fs_in)), T_prn_true_samples);
- if (corrected_acq_phase_samples < 0)
- {
- corrected_acq_phase_samples = T_prn_mod_samples + corrected_acq_phase_samples;
- }
- delay_correction_samples = d_acq_code_phase_samples - corrected_acq_phase_samples;
- d_acq_code_phase_samples = corrected_acq_phase_samples;
- d_carrier_doppler_hz = d_acq_carrier_doppler_hz;
-
- // DLL/PLL filter initialization
- d_carrier_loop_filter.initialize(); //initialize the carrier filter
- d_code_loop_filter.initialize(); //initialize the code filter
-
- // generate local reference ALWAYS starting at chip 1 (1 sample per chip)
- gps_l1_ca_code_gen_complex(&d_ca_code[1], d_acquisition_gnss_synchro->PRN, 0);
- d_ca_code[0] = d_ca_code[static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS)];
- d_ca_code[static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS) + 1] = d_ca_code[1];
-
- //******************************************************************************
- // Experimental: pre-sampled local signal replica at nominal code frequency.
- // No code doppler correction
- double tcode_chips;
- int associated_chip_index;
- int code_length_chips = static_cast<float>(GPS_L1_CA_CODE_LENGTH_CHIPS);
- double code_phase_step_chips;
- int early_late_spc_samples;
- int epl_loop_length_samples;
-
- // unified loop for E, P, L code vectors
- code_phase_step_chips = (static_cast<double>(d_code_freq_chips)) / (static_cast<double>(d_fs_in));
- tcode_chips = 0;
-
- // Alternative EPL code generation (40% of speed improvement!)
- early_late_spc_samples = round(d_early_late_spc_chips / code_phase_step_chips);
- epl_loop_length_samples = d_current_prn_length_samples +early_late_spc_samples*2;
- for (int i = 0; i < epl_loop_length_samples; i++)
- {
- associated_chip_index = 1 + round(fmod(tcode_chips - d_early_late_spc_chips, code_length_chips));
- d_early_code[i] = d_ca_code[associated_chip_index];
- tcode_chips = tcode_chips + code_phase_step_chips;
- }
-
- memcpy(d_prompt_code, &d_early_code[early_late_spc_samples], d_current_prn_length_samples* sizeof(gr_complex));
- memcpy(d_late_code, &d_early_code[early_late_spc_samples*2], d_current_prn_length_samples* sizeof(gr_complex));
- //******************************************************************************
-
- d_carrier_lock_fail_counter = 0;
- d_rem_code_phase_samples = 0;
- d_rem_carr_phase_rad = 0;
- d_acc_carrier_phase_rad = 0;
-
- d_code_phase_samples = d_acq_code_phase_samples;
-
- std::string sys_ = &d_acquisition_gnss_synchro->System;
- sys = sys_.substr(0,1);
-
- // DEBUG OUTPUT
- std::cout << "Tracking start on channel " << d_channel << " for satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN) << std::endl;
- LOG(INFO) << "Starting tracking of satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN) << " on channel " << d_channel;
-
- // enable tracking
- d_pull_in = true;
- d_enable_tracking = true;
-
- LOG(INFO) << "PULL-IN Doppler [Hz]=" << d_carrier_doppler_hz
- << " Code Phase correction [samples]=" << delay_correction_samples
- << " PULL-IN Code Phase [samples]=" << d_acq_code_phase_samples << std::endl;
-}
-
-
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::update_local_code()
-{
- double tcode_chips;
- double rem_code_phase_chips;
- int associated_chip_index;
- int code_length_chips = static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS);
- double code_phase_step_chips;
- int early_late_spc_samples;
- int epl_loop_length_samples;
-
- // unified loop for E, P, L code vectors
- code_phase_step_chips = (static_cast<double>(d_code_freq_chips)) / (static_cast<double>(d_fs_in));
- rem_code_phase_chips = d_rem_code_phase_samples * (d_code_freq_chips / d_fs_in);
- tcode_chips = -rem_code_phase_chips;
-
- //EPL code generation
- early_late_spc_samples = round(d_early_late_spc_chips / code_phase_step_chips);
- epl_loop_length_samples = d_current_prn_length_samples + early_late_spc_samples*2;
- for (int i = 0; i < epl_loop_length_samples; i++)
- {
- associated_chip_index = 1 + round(fmod(tcode_chips - d_early_late_spc_chips, code_length_chips));
- d_early_code[i] = d_ca_code[associated_chip_index];
- tcode_chips = tcode_chips + code_phase_step_chips;
- }
-
- memcpy(d_prompt_code, &d_early_code[early_late_spc_samples], d_current_prn_length_samples* sizeof(gr_complex));
- memcpy(d_late_code, &d_early_code[early_late_spc_samples*2], d_current_prn_length_samples* sizeof(gr_complex));
-}
-
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::update_local_carrier()
-{
- float phase_step_rad;
- phase_step_rad = static_cast<float>(GPS_TWO_PI) * d_carrier_doppler_hz / static_cast<float>(d_fs_in);
- fxp_nco(d_carr_sign, d_current_prn_length_samples, d_rem_carr_phase_rad, phase_step_rad);
-}
-
-
-Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::~Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc()
-{
- d_dump_file.close();
-
- volk_free(d_prompt_code);
- volk_free(d_late_code);
- volk_free(d_early_code);
- volk_free(d_carr_sign);
- volk_free(d_Early);
- volk_free(d_Prompt);
- volk_free(d_Late);
-
- delete[] d_ca_code;
- delete[] d_Prompt_buffer;
-}
-
-
-// Tracking signal processing
-int Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items, gr_vector_void_star &output_items)
-{
- // stream to collect cout calls to improve thread safety
- std::stringstream tmp_str_stream;
- double carr_error_hz = 0.0;
- double carr_error_filt_hz = 0.0;
- double code_error_chips = 0.0;
- double code_error_filt_chips = 0.0;
-
- if (d_enable_tracking == true)
- {
- /*
- * Receiver signal alignment
- */
- if (d_pull_in == true)
- {
- int samples_offset;
- float acq_trk_shif_correction_samples;
- int acq_to_trk_delay_samples;
- acq_to_trk_delay_samples = d_sample_counter - d_acq_sample_stamp;
- acq_trk_shif_correction_samples = d_current_prn_length_samples - fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
- samples_offset = round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
- d_sample_counter = d_sample_counter + samples_offset; //count for the processed samples
- d_pull_in = false;
- consume_each(samples_offset); //shift input to perform alignment with local replica
- return 1;
- }
- // GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
- Gnss_Synchro current_synchro_data;
- // Fill the acquisition data
- current_synchro_data = *d_acquisition_gnss_synchro;
-
- // Block input data and block output stream pointers
- const gr_complex* in = (gr_complex*) input_items[0]; //PRN start block alignment
- Gnss_Synchro **out = (Gnss_Synchro **) &output_items[0];
-
- // Generate local code and carrier replicas (using \hat{f}_d(k-1))
- //update_local_code(); //disabled in the speed optimized tracking!
- update_local_carrier();
-
- // perform Early, Prompt and Late correlation
-#if USING_VOLK_CW_EPL_CORR_CUSTOM
- d_correlator.Carrier_wipeoff_and_EPL_volk_custom(d_current_prn_length_samples,
- in,
- d_carr_sign,
- d_early_code,
- d_prompt_code,
- d_late_code,
- d_Early,
- d_Prompt,
- d_Late);
-#else
- d_correlator.Carrier_wipeoff_and_EPL_volk(d_current_prn_length_samples,
- in,
- d_carr_sign,
- d_early_code,
- d_prompt_code,
- d_late_code,
- d_Early,
- d_Prompt,
- d_Late);
-#endif
- // ################## PLL ##########################################################
- // PLL discriminator
- carr_error_hz = pll_cloop_two_quadrant_atan(*d_Prompt) / GPS_TWO_PI;
- // Carrier discriminator filter
- carr_error_filt_hz = d_carrier_loop_filter.get_carrier_nco(carr_error_hz);
- // New carrier Doppler frequency estimation
- d_carrier_doppler_hz = d_acq_carrier_doppler_hz + carr_error_filt_hz;
- // New code Doppler frequency estimation
- d_code_freq_chips = GPS_L1_CA_CODE_RATE_HZ + ((d_carrier_doppler_hz * GPS_L1_CA_CODE_RATE_HZ) / GPS_L1_FREQ_HZ);
- //carrier phase accumulator for (K) doppler estimation
- d_acc_carrier_phase_rad -= GPS_TWO_PI * d_carrier_doppler_hz * GPS_L1_CA_CODE_PERIOD;
- //remnant carrier phase to prevent overflow in the code NCO
- d_rem_carr_phase_rad = d_rem_carr_phase_rad + GPS_TWO_PI * d_carrier_doppler_hz * GPS_L1_CA_CODE_PERIOD;
- d_rem_carr_phase_rad = fmod(d_rem_carr_phase_rad, GPS_TWO_PI);
-
- // ################## DLL ##########################################################
- // DLL discriminator
- code_error_chips = dll_nc_e_minus_l_normalized(*d_Early, *d_Late); //[chips/Ti]
- // Code discriminator filter
- code_error_filt_chips = d_code_loop_filter.get_code_nco(code_error_chips); //[chips/second]
- //Code phase accumulator
- double code_error_filt_secs;
- code_error_filt_secs = (GPS_L1_CA_CODE_PERIOD * code_error_filt_chips) / GPS_L1_CA_CODE_RATE_HZ; //[seconds]
- d_acc_code_phase_secs = d_acc_code_phase_secs + code_error_filt_secs;
-
- // ################## CARRIER AND CODE NCO BUFFER ALIGNEMENT #######################
- // keep alignment parameters for the next input buffer
- double T_chip_seconds;
- double T_prn_seconds;
- double T_prn_samples;
- double K_blk_samples;
- // Compute the next buffer length based in the new period of the PRN sequence and the code phase error estimation
- T_chip_seconds = 1.0 / d_code_freq_chips;
- T_prn_seconds = T_chip_seconds * GPS_L1_CA_CODE_LENGTH_CHIPS;
- T_prn_samples = T_prn_seconds * static_cast<double>(d_fs_in);
- K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in);
- d_current_prn_length_samples = round(K_blk_samples); //round to a discrete samples
- //d_rem_code_phase_samples = K_blk_samples - d_current_prn_length_samples; //rounding error < 1 sample
-
- // ####### CN0 ESTIMATION AND LOCK DETECTORS ######
- if (d_cn0_estimation_counter < CN0_ESTIMATION_SAMPLES)
- {
- // fill buffer with prompt correlator output values
- d_Prompt_buffer[d_cn0_estimation_counter] = *d_Prompt;
- d_cn0_estimation_counter++;
- }
- else
- {
- d_cn0_estimation_counter = 0;
- // Code lock indicator
- d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, CN0_ESTIMATION_SAMPLES, d_fs_in, GPS_L1_CA_CODE_LENGTH_CHIPS);
- // Carrier lock indicator
- d_carrier_lock_test = carrier_lock_detector(d_Prompt_buffer, CN0_ESTIMATION_SAMPLES);
- // Loss of lock detection
- if (d_carrier_lock_test < d_carrier_lock_threshold or d_CN0_SNV_dB_Hz < MINIMUM_VALID_CN0)
- {
- d_carrier_lock_fail_counter++;
- }
- else
- {
- if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
- }
- if (d_carrier_lock_fail_counter > MAXIMUM_LOCK_FAIL_COUNTER)
- {
- std::cout << "Loss of lock in channel " << d_channel << "!" << std::endl;
- LOG(INFO) << "Loss of lock in channel " << d_channel << "!";
- std::unique_ptr<ControlMessageFactory> cmf(new ControlMessageFactory());
- if (d_queue != gr::msg_queue::sptr())
- {
- d_queue->handle(cmf->GetQueueMessage(d_channel, 2));
- }
- d_carrier_lock_fail_counter = 0;
- d_enable_tracking = false; // TODO: check if disabling tracking is consistent with the channel state machine
- }
- }
- // ########### Output the tracking data to navigation and PVT ##########
- current_synchro_data.Prompt_I = static_cast<double>((*d_Prompt).real());
- current_synchro_data.Prompt_Q = static_cast<double>((*d_Prompt).imag());
- // Tracking_timestamp_secs is aligned with the PRN start sample
- //current_synchro_data.Tracking_timestamp_secs = ((double)d_sample_counter + (double)d_current_prn_length_samples + (double)d_rem_code_phase_samples) / static_cast<double>(d_fs_in);
- current_synchro_data.Tracking_timestamp_secs = (static_cast<double>(d_sample_counter) + static_cast<double>(d_rem_code_phase_samples)) / static_cast<double>(d_fs_in);
- d_rem_code_phase_samples = K_blk_samples - d_current_prn_length_samples; //rounding error < 1 sample
- // This tracking block aligns the Tracking_timestamp_secs with the start sample of the PRN, thus, Code_phase_secs=0
- current_synchro_data.Code_phase_secs = 0;
- current_synchro_data.Carrier_phase_rads = static_cast<double>(d_acc_carrier_phase_rad);
- current_synchro_data.Carrier_Doppler_hz = static_cast<double>(d_carrier_doppler_hz);
- current_synchro_data.CN0_dB_hz = static_cast<double>(d_CN0_SNV_dB_Hz);
- current_synchro_data.Flag_valid_pseudorange = false;
- *out[0] = current_synchro_data;
-
- // ########## DEBUG OUTPUT
- /*!
- * \todo The stop timer has to be moved to the signal source!
- */
- if (floor(d_sample_counter / d_fs_in) != d_last_seg)
- {
- d_last_seg = floor(d_sample_counter / d_fs_in);
-
- if (d_channel == 0)
- {
- // debug: Second counter in channel 0
- tmp_str_stream << "Current input signal time = " << d_last_seg << " [s]" << std::endl;
- std::cout << tmp_str_stream.rdbuf();
- LOG(INFO) << tmp_str_stream.rdbuf();
- }
-
- tmp_str_stream << "Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN)
- << ", Doppler=" << d_carrier_doppler_hz << " [Hz] CN0 = " << d_CN0_SNV_dB_Hz << " [dB-Hz]" << std::endl;
- //std::cout << tmp_str_stream.rdbuf() << std::flush;
- LOG(INFO) << tmp_str_stream.rdbuf();
- //if (d_channel == 0 || d_last_seg==5) d_carrier_lock_fail_counter=500; //DEBUG: force unlock!
- }
- }
- else
- {
- // ########## DEBUG OUTPUT (TIME ONLY for channel 0 when tracking is disabled)
- /*!
- * \todo The stop timer has to be moved to the signal source!
- */
- // stream to collect cout calls to improve thread safety
- std::stringstream tmp_str_stream;
- if (floor(d_sample_counter / d_fs_in) != d_last_seg)
- {
- d_last_seg = floor(d_sample_counter / d_fs_in);
-
- if (d_channel == 0)
- {
- // debug: Second counter in channel 0
- tmp_str_stream << "Current input signal time = " << d_last_seg << " [s]" << std::endl << std::flush;
- std::cout << tmp_str_stream.rdbuf() << std::flush;
- }
- }
- *d_Early = gr_complex(0,0);
- *d_Prompt = gr_complex(0,0);
- *d_Late = gr_complex(0,0);
- Gnss_Synchro **out = (Gnss_Synchro **) &output_items[0]; //block output streams pointer
- // GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
- d_acquisition_gnss_synchro->Flag_valid_pseudorange = false;
- *out[0] = *d_acquisition_gnss_synchro;
- }
-
- if(d_dump)
- {
- // MULTIPLEXED FILE RECORDING - Record results to file
- float prompt_I;
- float prompt_Q;
- float tmp_E, tmp_P, tmp_L;
- float tmp_float;
- double tmp_double;
- prompt_I = (*d_Prompt).real();
- prompt_Q = (*d_Prompt).imag();
- tmp_E = std::abs<float>(*d_Early);
- tmp_P = std::abs<float>(*d_Prompt);
- tmp_L = std::abs<float>(*d_Late);
- try
- {
- // EPR
- d_dump_file.write((char*)&tmp_E, sizeof(float));
- d_dump_file.write((char*)&tmp_P, sizeof(float));
- d_dump_file.write((char*)&tmp_L, sizeof(float));
- // PROMPT I and Q (to analyze navigation symbols)
- d_dump_file.write((char*)&prompt_I, sizeof(float));
- d_dump_file.write((char*)&prompt_Q, sizeof(float));
- // PRN start sample stamp
- //tmp_float=(float)d_sample_counter;
- d_dump_file.write((char*)&d_sample_counter, sizeof(unsigned long int));
- // accumulated carrier phase
- tmp_float = d_acc_carrier_phase_rad;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
-
- // carrier and code frequency
- tmp_float = d_carrier_doppler_hz;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
- tmp_float = d_code_freq_chips;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
-
- //PLL commands
- tmp_float = carr_error_hz;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
- tmp_float = carr_error_filt_hz;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
-
- //DLL commands
- tmp_float = code_error_chips;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
- tmp_float = code_error_filt_chips;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
-
- // CN0 and carrier lock test
- tmp_float = d_CN0_SNV_dB_Hz;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
- tmp_float = d_carrier_lock_test;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
-
- // AUX vars (for debug purposes)
- tmp_float = d_rem_code_phase_samples;
- d_dump_file.write((char*)&tmp_float, sizeof(float));
- tmp_double = (double)(d_sample_counter + d_current_prn_length_samples);
- d_dump_file.write((char*)&tmp_double, sizeof(double));
- }
- catch (std::ifstream::failure& e)
- {
- LOG(WARNING) << "Exception writing trk dump file " << e.what();
- }
- }
-
- consume_each(d_current_prn_length_samples); // this is necesary in gr_block derivates
- d_sample_counter += d_current_prn_length_samples; //count for the processed samples
- if((noutput_items == 0) || (ninput_items[0] == 0))
- {
- LOG(WARNING) << "noutput_items = 0";
- }
- return 1; //output tracking result ALWAYS even in the case of d_enable_tracking==false
-}
-
-
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::set_channel(unsigned int channel)
-{
- d_channel = channel;
- LOG(INFO) << "Tracking Channel set to " << d_channel;
- // ############# ENABLE DATA FILE LOG #################
- if (d_dump == true)
- {
- if (d_dump_file.is_open() == false)
- {
- try
- {
- d_dump_filename.append(boost::lexical_cast<std::string>(d_channel));
- d_dump_filename.append(".dat");
- d_dump_file.exceptions (std::ifstream::failbit | std::ifstream::badbit);
- d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
- LOG(INFO) << "Tracking dump enabled on channel " << d_channel << " Log file: " << d_dump_filename.c_str();
- }
- catch (std::ifstream::failure& e)
- {
- LOG(WARNING) << "channel " << d_channel << " Exception opening trk dump file " << e.what();
- }
- }
- }
-}
-
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::set_channel_queue(concurrent_queue<int> *channel_internal_queue)
-{
- d_channel_internal_queue = channel_internal_queue;
-}
-
-void Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
-{
- d_acquisition_gnss_synchro = p_gnss_synchro;
-
-}
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
deleted file mode 100644
index 8c02abc..0000000
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*!
- * \file gps_l1_ca_dll_pll_optim_tracking_cc.h
- * \brief Implementation of a code DLL + carrier PLL tracking block
- * \author Javier Arribas, 2012. jarribas(at)cttc.es
- * GPS L1 TRACKING MODULE OPTIMIZED FOR SPEED:
- * - Code Doppler is not compensated in the local replica
- * Code DLL + carrier PLL according to the algorithms described in:
- * [1] K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
- * A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
- *
- * -------------------------------------------------------------------------
- *
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
- *
- * GNSS-SDR is a software defined Global Navigation
- * Satellite Systems receiver
- *
- * This file is part of GNSS-SDR.
- *
- * GNSS-SDR is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNSS-SDR is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
- *
- * -------------------------------------------------------------------------
- */
-
-#ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_CC_H
-#define GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_CC_H
-
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
-#include "gnss_synchro.h"
-#include "tracking_2nd_DLL_filter.h"
-#include "tracking_2nd_PLL_filter.h"
-#include "correlator.h"
-
-class Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc;
-
-typedef boost::shared_ptr<Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc> gps_l1_ca_dll_pll_optim_tracking_cc_sptr;
-
-gps_l1_ca_dll_pll_optim_tracking_cc_sptr gps_l1_ca_dll_pll_make_optim_tracking_cc(long if_freq,
- long fs_in,
- unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
- bool dump,
- std::string dump_filename,
- float pll_bw_hz,
- float dll_bw_hz,
- float early_late_space_chips);
-
-
-/*!
- * \brief This class implements a DLL + PLL tracking loop block
- */
-class Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc: public gr::block
-{
-public:
- ~Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc();
-
- void set_channel(unsigned int channel);
- void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
- void start_tracking();
- void set_channel_queue(concurrent_queue<int> *channel_internal_queue);
-
- int general_work (int noutput_items, gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
-
- void forecast (int noutput_items, gr_vector_int &ninput_items_required);
-private:
- friend gps_l1_ca_dll_pll_optim_tracking_cc_sptr
- gps_l1_ca_dll_pll_make_optim_tracking_cc(long if_freq,
- long fs_in, unsigned
- int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
- bool dump,
- std::string dump_filename,
- float pll_bw_hz,
- float dll_bw_hz,
- float early_late_space_chips);
-
- Gps_L1_Ca_Dll_Pll_Optim_Tracking_cc(long if_freq,
- long fs_in, unsigned
- int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
- bool dump,
- std::string dump_filename,
- float pll_bw_hz,
- float dll_bw_hz,
- float early_late_space_chips);
- void update_local_code();
- void update_local_carrier();
-
- // tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
- concurrent_queue<int> *d_channel_internal_queue;
- unsigned int d_vector_length;
- bool d_dump;
-
- Gnss_Synchro* d_acquisition_gnss_synchro;
- unsigned int d_channel;
- int d_last_seg;
- long d_if_freq;
- long d_fs_in;
-
- double d_early_late_spc_chips;
-
- gr_complex* d_ca_code;
-
- gr_complex* d_early_code;
- gr_complex* d_late_code;
- gr_complex* d_prompt_code;
- gr_complex* d_carr_sign;
-
- gr_complex *d_Early;
- gr_complex *d_Prompt;
- gr_complex *d_Late;
-
- // remaining code phase and carrier phase between tracking loops
- double d_rem_code_phase_samples;
- double d_rem_carr_phase_rad;
-
- // PLL and DLL filter library
- Tracking_2nd_DLL_filter d_code_loop_filter;
- Tracking_2nd_PLL_filter d_carrier_loop_filter;
-
- // acquisition
- double d_acq_code_phase_samples;
- double d_acq_carrier_doppler_hz;
- // correlator
- Correlator d_correlator;
-
- // tracking vars
- double d_code_freq_chips;
- double d_carrier_doppler_hz;
- double d_acc_carrier_phase_rad;
- double d_code_phase_samples;
- double d_acc_code_phase_secs;
-
- //PRN period in samples
- int d_current_prn_length_samples;
-
- //processing samples counters
- unsigned long int d_sample_counter;
- unsigned long int d_acq_sample_stamp;
-
- // CN0 estimation and lock detector
- int d_cn0_estimation_counter;
- gr_complex* d_Prompt_buffer;
- double d_carrier_lock_test;
- double d_CN0_SNV_dB_Hz;
- double d_carrier_lock_threshold;
- int d_carrier_lock_fail_counter;
-
- // control vars
- int d_gnuradio_forecast_samples;
- bool d_enable_tracking;
- bool d_pull_in;
-
- // file dump
- std::string d_dump_filename;
- std::ofstream d_dump_file;
-
- std::map<std::string, std::string> systemName;
- std::string sys;
-};
-
-#endif //GNSS_SDR_GPS_L1_CA_DLL_PLL_OPTIM_TRACKING_CC_H
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 65aa2f5..2c179db 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -80,7 +80,6 @@
#include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
#include "gps_l1_ca_dll_pll_tracking.h"
#include "gps_l1_ca_dll_pll_c_aid_tracking.h"
-#include "gps_l1_ca_dll_pll_optim_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"
@@ -1324,12 +1323,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
out_streams, queue));
block = std::move(block_);
}
- else if (implementation.compare("GPS_L1_CA_DLL_PLL_Optim_Tracking") == 0)
- {
- std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaDllPllOptimTracking(configuration.get(), role, in_streams,
- out_streams, queue));
- block = std::move(block_);
- }
else if (implementation.compare("GPS_L1_CA_DLL_FLL_PLL_Tracking") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaDllFllPllTracking(configuration.get(), role, in_streams,
@@ -1589,12 +1582,6 @@ std::unique_ptr<TrackingInterface> GNSSBlockFactory::GetTrkBlock(
out_streams, queue));
block = std::move(block_);
}
- else if (implementation.compare("GPS_L1_CA_DLL_PLL_Optim_Tracking") == 0)
- {
- std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllOptimTracking(configuration.get(), role, in_streams,
- out_streams, queue));
- block = std::move(block_);
- }
else if (implementation.compare("GPS_L1_CA_DLL_FLL_PLL_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllFllPllTracking(configuration.get(), role, in_streams,
--
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