From 8c84702f27518c2cf8ec6929236a5262d157b922 Mon Sep 17 00:00:00 2001 From: Marc Majoral Date: Thu, 18 Jul 2019 19:12:17 +0200 Subject: [PATCH] implemented the stop_tracking() function --- .../galileo_e1_dll_pll_veml_tracking_fpga.cc | 1 + .../galileo_e5a_dll_pll_tracking_fpga.cc | 1 + .../adapters/gps_l1_ca_dll_pll_tracking_fpga.cc | 1 + .../adapters/gps_l5_dll_pll_tracking_fpga.cc | 1 + .../dll_pll_veml_tracking_fpga.cc | 16 +--------------- .../gnuradio_blocks/dll_pll_veml_tracking_fpga.h | 4 ---- 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc index dbbf014df..fc8f0e712 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc @@ -286,6 +286,7 @@ GalileoE1DllPllVemlTrackingFpga::~GalileoE1DllPllVemlTrackingFpga() void GalileoE1DllPllVemlTrackingFpga::stop_tracking() { + tracking_fpga_sc->stop_tracking(); } diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc index a6e3014f1..2b681d7ed 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc @@ -304,6 +304,7 @@ void GalileoE5aDllPllTrackingFpga::start_tracking() void GalileoE5aDllPllTrackingFpga::stop_tracking() { + tracking_fpga_sc->stop_tracking(); } diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc index 97e075c13..254c0471c 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc @@ -252,6 +252,7 @@ void GpsL1CaDllPllTrackingFpga::start_tracking() void GpsL1CaDllPllTrackingFpga::stop_tracking() { + tracking_fpga_sc->stop_tracking(); } diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc index e830518cb..b2d13c49a 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc @@ -327,6 +327,7 @@ void GpsL5DllPllTrackingFpga::start_tracking() void GpsL5DllPllTrackingFpga::stop_tracking() { + tracking_fpga_sc->stop_tracking(); } 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 196eba014..3b494c939 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 @@ -527,13 +527,6 @@ void dll_pll_veml_tracking_fpga::start_tracking() } -////bool dll_pll_veml_tracking_fpga::stop() -//void dll_pll_veml_tracking_fpga::stop() -//{ -// d_stop_tracking = true; -// //return true; -//} - dll_pll_veml_tracking_fpga::~dll_pll_veml_tracking_fpga() { @@ -1487,7 +1480,7 @@ void dll_pll_veml_tracking_fpga::set_gnss_synchro(Gnss_Synchro *p_gnss_synchro) void dll_pll_veml_tracking_fpga::stop_tracking() { - d_state = 1; + d_stop_tracking = true; } @@ -2005,13 +1998,6 @@ int dll_pll_veml_tracking_fpga::general_work(int noutput_items __attribute__((un *out[0] = current_synchro_data; return 1; } -// else -// { -// current_synchro_data = *d_acquisition_gnss_synchro; -// current_synchro_data.Flag_valid_symbol_output = false; -// *out[0] = *d_acquisition_gnss_synchro; -// return 1; -// } return 0; 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 424556130..3c3e2a203 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 @@ -74,10 +74,6 @@ public: void reset(void); - //bool stop(void); -// void stop(void); - - private: friend dll_pll_veml_tracking_fpga_sptr dll_pll_veml_make_tracking_fpga(const Dll_Pll_Conf_Fpga &conf_); void msg_handler_telemetry_to_trk(const pmt::pmt_t &msg);