From 5bc7a778e9128cc64543b5a413ab24d51a8ff8e4 Mon Sep 17 00:00:00 2001 From: Marc Majoral Date: Tue, 2 Apr 2019 13:10:09 +0200 Subject: [PATCH] commented out the old DLL and PLL filters in the tracking modules + removed some old not used code in the acquisition that was already commented out. --- .../acquisition/libs/fpga_acquisition.cc | 6 ------ .../gnuradio_blocks/dll_pll_veml_tracking_fpga.cc | 14 +++++++------- .../gnuradio_blocks/dll_pll_veml_tracking_fpga.h | 6 +++--- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.cc b/src/algorithms/acquisition/libs/fpga_acquisition.cc index 6308a8f3f..21822384a 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.cc +++ b/src/algorithms/acquisition/libs/fpga_acquisition.cc @@ -133,12 +133,6 @@ void Fpga_Acquisition::write_local_code() // write local code for (uint32_t k = 0; k < d_vector_length; k++) { - // tmp = d_all_fft_codes[d_nsamples_total * (d_PRN - 1) + k].real(); - // tmp2 = d_all_fft_codes[d_nsamples_total * (d_PRN - 1) + k].imag(); - // - // local_code = (tmp & SELECT_LSBits) | ((tmp2 * SHL_CODE_BITS) & SELECT_MSBbits); // put together the real part and the imaginary part - // fft_data = local_code & SELECT_ALL_CODE_BITS; - // d_map_base[6] = fft_data; d_map_base[6] = d_all_fft_codes[d_nsamples_total * (d_PRN - 1) + k]; } } diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index 60b9d725c..42f92beb2 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -275,9 +275,9 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga & printf("trk_parameters.fll_bw_hz = %f trk_parameters.pll_bw_hz = %f trk_parameters.pll_filter_order = %d\n", trk_parameters.fll_bw_hz, trk_parameters.pll_bw_hz, trk_parameters.pll_filter_order); d_carrier_loop_filter.set_params(trk_parameters.fll_bw_hz, trk_parameters.pll_bw_hz, trk_parameters.pll_filter_order); //d_code_loop_filter_old.set_DLL_BW(trk_parameters.dll_bw_hz); - d_carrier_loop_filter_old.set_PLL_BW(trk_parameters.pll_bw_hz); + //d_carrier_loop_filter_old.set_PLL_BW(trk_parameters.pll_bw_hz); //d_code_loop_filter_old = Tracking_2nd_DLL_filter(static_cast(d_code_period)); - d_carrier_loop_filter_old = Tracking_2nd_PLL_filter(static_cast(d_code_period)); + //d_carrier_loop_filter_old = Tracking_2nd_PLL_filter(static_cast(d_code_period)); if (d_veml) { @@ -1300,7 +1300,7 @@ void dll_pll_veml_tracking_fpga::set_gnss_synchro(Gnss_Synchro *p_gnss_synchro) d_carr_ph_history.clear(); // DLL/PLL filter initialization - d_carrier_loop_filter_old.initialize(); // initialize the carrier filter + //d_carrier_loop_filter_old.initialize(); // initialize the carrier filter //d_code_loop_filter_old.initialize(); // initialize the code filter if (systemName == "GPS" and signal_type == "L5") @@ -1355,8 +1355,8 @@ void dll_pll_veml_tracking_fpga::set_gnss_synchro(Gnss_Synchro *p_gnss_synchro) d_current_correlation_time_s = d_code_period; //d_code_loop_filter_old.set_DLL_BW(trk_parameters.dll_bw_hz); - d_carrier_loop_filter_old.set_PLL_BW(trk_parameters.pll_bw_hz); - d_carrier_loop_filter_old.set_pdi(static_cast(d_code_period)); + //d_carrier_loop_filter_old.set_PLL_BW(trk_parameters.pll_bw_hz); + //d_carrier_loop_filter_old.set_pdi(static_cast(d_code_period)); //d_code_loop_filter_old.set_pdi(static_cast(d_code_period)); d_code_loop_filter.set_noise_bandwidth(trk_parameters.dll_bw_hz); @@ -1773,7 +1773,7 @@ void dll_pll_veml_tracking_fpga::run_state_2(Gnss_Synchro ¤t_synchro_data) d_extend_correlation_symbols_count = 0; d_current_correlation_time_s = static_cast(trk_parameters.extend_correlation_symbols) * static_cast(d_code_period); float new_correlation_time = static_cast(trk_parameters.extend_correlation_symbols) * static_cast(d_code_period); - d_carrier_loop_filter_old.set_pdi(new_correlation_time); + //d_carrier_loop_filter_old.set_pdi(new_correlation_time); //d_code_loop_filter_old.set_pdi(new_correlation_time); d_state = 3; // next state is the extended correlator integrator LOG(INFO) << "Enabled " << trk_parameters.extend_correlation_symbols * static_cast(d_code_period * 1000.0) << " ms extended correlator in channel " @@ -1784,7 +1784,7 @@ void dll_pll_veml_tracking_fpga::run_state_2(Gnss_Synchro ¤t_synchro_data) << " for satellite " << Gnss_Satellite(systemName, d_acquisition_gnss_synchro->PRN) << std::endl; // Set narrow taps delay values [chips] //d_code_loop_filter_old.set_DLL_BW(trk_parameters.dll_bw_narrow_hz); - d_carrier_loop_filter_old.set_PLL_BW(trk_parameters.pll_bw_narrow_hz); + //d_carrier_loop_filter_old.set_PLL_BW(trk_parameters.pll_bw_narrow_hz); d_code_loop_filter.set_update_interval(d_current_correlation_time_s); d_code_loop_filter.set_noise_bandwidth(trk_parameters.dll_bw_narrow_hz); d_carrier_loop_filter.set_params(trk_parameters.fll_bw_hz, trk_parameters.pll_bw_narrow_hz, trk_parameters.pll_filter_order); diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h index dbdfc71d4..3abb32b47 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h @@ -33,8 +33,8 @@ #define GNSS_SDR_DLL_PLL_VEML_TRACKING_FPGA_H #include "dll_pll_conf_fpga.h" -#include "tracking_2nd_DLL_filter.h" -#include "tracking_2nd_PLL_filter.h" +//#include "tracking_2nd_DLL_filter.h" +//#include "tracking_2nd_PLL_filter.h" #include "tracking_FLL_PLL_filter.h" // for PLL/FLL filter #include "tracking_loop_filter.h" // for DLL filter #include @@ -172,7 +172,7 @@ private: // PLL and DLL filter library //Tracking_2nd_DLL_filter d_code_loop_filter_old; - Tracking_2nd_PLL_filter d_carrier_loop_filter_old; + //Tracking_2nd_PLL_filter d_carrier_loop_filter_old; // acquisition double d_acq_code_phase_samples;