From 900c4b12b4524e81ba07e752251e40f8ed8ebd14 Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Thu, 13 Nov 2025 17:59:49 +0000 Subject: [PATCH 1/4] Remove set_state from acquisition classes --- .../adapters/base_pcps_acquisition.cc | 6 -- .../adapters/base_pcps_acquisition.h | 5 -- .../adapters/base_pcps_acquisition_custom.cc | 10 --- .../adapters/base_pcps_acquisition_custom.h | 5 -- .../adapters/base_pcps_acquisition_fpga.cc | 9 --- .../adapters/base_pcps_acquisition_fpga.h | 1 - .../acquisition_impl_interface.h | 1 - ...o_e5a_noncoherent_iq_acquisition_caf_cc.cc | 58 +++++--------- ...eo_e5a_noncoherent_iq_acquisition_caf_cc.h | 12 ++- .../galileo_pcps_8ms_acquisition_cc.cc | 59 ++++---------- .../galileo_pcps_8ms_acquisition_cc.h | 12 ++- .../gnuradio_blocks/pcps_acquisition.cc | 28 ------- .../gnuradio_blocks/pcps_acquisition.h | 7 -- .../pcps_acquisition_fine_doppler_cc.cc | 54 ++++--------- .../pcps_acquisition_fine_doppler_cc.h | 12 ++- .../pcps_assisted_acquisition_cc.cc | 14 ++-- .../pcps_assisted_acquisition_cc.h | 10 +-- .../pcps_cccwsr_acquisition_cc.cc | 59 ++++---------- .../pcps_cccwsr_acquisition_cc.h | 12 ++- .../pcps_opencl_acquisition_cc.cc | 26 ------- .../pcps_opencl_acquisition_cc.h | 12 ++- .../pcps_quicksync_acquisition_cc.cc | 60 +++++---------- .../pcps_quicksync_acquisition_cc.h | 12 ++- .../pcps_tong_acquisition_cc.cc | 77 ++++++------------- .../pcps_tong_acquisition_cc.h | 12 ++- src/core/interfaces/acquisition_interface.h | 1 - .../acquisition/acq_performance_test.cc | 3 +- .../beidou_b1i_pcps_acquisition_test.cc | 6 +- .../beidou_b3i_pcps_acquisition_test.cc | 6 +- ...8ms_ambiguous_acquisition_gsoc2013_test.cc | 4 +- ...cps_ambiguous_acquisition_gsoc2013_test.cc | 4 +- ...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 1 - ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 1 - ...wsr_ambiguous_acquisition_gsoc2013_test.cc | 2 - ...ync_ambiguous_acquisition_gsoc2014_test.cc | 5 +- ...ong_ambiguous_acquisition_gsoc2013_test.cc | 4 +- ...cps_acquisition_gsoc2014_gensource_test.cc | 2 +- .../galileo_e5b_pcps_acquisition_test.cc | 2 +- .../galileo_e6_pcps_acquisition_test.cc | 2 +- ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc | 2 +- .../glonass_l1_ca_pcps_acquisition_test.cc | 2 +- .../glonass_l2_ca_pcps_acquisition_test.cc | 2 +- ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 2 +- .../gps_l1_ca_pcps_acquisition_test.cc | 2 +- ...cps_quicksync_acquisition_gsoc2014_test.cc | 3 - ..._ca_pcps_tong_acquisition_gsoc2013_test.cc | 4 +- .../gps_l2_m_pcps_acquisition_test.cc | 2 +- .../observables/hybrid_observables_test.cc | 3 +- .../tracking/tracking_pull-in_test.cc | 3 +- 49 files changed, 185 insertions(+), 456 deletions(-) diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc index faa63ab19..ecd6f0a7f 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc @@ -147,12 +147,6 @@ void BasePcpsAcquisition::reset() } -void BasePcpsAcquisition::set_state(int state) -{ - acquisition_->set_state(state); -} - - void BasePcpsAcquisition::connect(gr::top_block_sptr top_block) { if (acq_parameters_.item_type == "gr_complex" || acq_parameters_.item_type == "cshort") diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition.h b/src/algorithms/acquisition/adapters/base_pcps_acquisition.h index 39d3fe3eb..c21519bf7 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition.h @@ -118,11 +118,6 @@ public: */ void reset() override; - /*! - * \brief If state = 1, it forces the block to start acquiring from the first sample - */ - void set_state(int state) override; - /*! * \brief Stop running acquisition */ diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.cc b/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.cc index 66e3f2c2b..509ed8113 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.cc +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.cc @@ -224,21 +224,11 @@ void BasePcpsAcquisitionCustom::stop_acquisition() { if (is_type_gr_complex_) { - acquisition_cc_->set_state(0); acquisition_cc_->set_active(false); } } -void BasePcpsAcquisitionCustom::set_state(int state) -{ - if (is_type_gr_complex_) - { - acquisition_cc_->set_state(state); - } -} - - void BasePcpsAcquisitionCustom::set_threshold(float threshold) { if (is_type_gr_complex_) diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.h b/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.h index 2b8737222..9ae74ac41 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.h +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition_custom.h @@ -102,11 +102,6 @@ public: */ void stop_acquisition() override; - /*! - * \brief If state = 1, it forces the block to start acquiring from the first sample - */ - void set_state(int state) override; - /*! * \brief Set statistics threshold of PCPS algorithm */ diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc index 71d12e8ea..d0d17b821 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc @@ -175,15 +175,6 @@ void BasePcpsAcquisitionFpga::set_doppler_center(int doppler_center) } -void BasePcpsAcquisitionFpga::set_state(int state) -{ - if (acquisition_fpga_) - { - acquisition_fpga_->set_state(state); - } -} - - void BasePcpsAcquisitionFpga::reset() { if (acquisition_fpga_) diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.h index 63e8941d0..e170976c5 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.h @@ -72,7 +72,6 @@ public: void set_channel_fsm(std::weak_ptr channel_fsm) override; void set_threshold(float threshold) override; void set_doppler_center(int doppler_center) override; - void set_state(int state) override; void reset() override; void stop_acquisition() override; void init() override; diff --git a/src/algorithms/acquisition/gnuradio_blocks/acquisition_impl_interface.h b/src/algorithms/acquisition/gnuradio_blocks/acquisition_impl_interface.h index bb007f9e5..119437c8c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/acquisition_impl_interface.h +++ b/src/algorithms/acquisition/gnuradio_blocks/acquisition_impl_interface.h @@ -61,7 +61,6 @@ public: virtual void init() = 0; virtual void set_local_code(std::complex* /*code*/) {}; virtual void set_local_code(std::complex* /*code_data*/, std::complex* /*code_pilot*/) {}; - virtual void set_state(int32_t state) = 0; virtual uint32_t mag() const = 0; virtual void set_active(bool active) = 0; }; diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index 929e737dc..4ee0971d3 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -244,30 +244,6 @@ void galileo_e5a_noncoherentIQ_acquisition_caf_cc::init() } -void galileo_e5a_noncoherentIQ_acquisition_caf_cc::set_state(int state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -286,6 +262,14 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items int acquisition_message = -1; // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL int return_value = 0; // 0=Produces no Gnss_Synchro objects + + if (!d_active) + { + d_sample_counter += static_cast(ninput_items[0]); // sample counter + consume_each(ninput_items[0]); + return 0; + } + /* States: 0 Stop Channel * 1 Load the buffer until it reaches fft_size * 2 Acquisition algorithm @@ -296,22 +280,16 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items { case 0: { - if (d_active) - { - // restart acquisition variables - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - d_state = 1; - } - d_sample_counter += static_cast(ninput_items[0]); // sample counter - consume_each(ninput_items[0]); - + // restart acquisition variables + d_gnss_synchro->Acq_delay_samples = 0.0; + d_gnss_synchro->Acq_doppler_hz = 0.0; + d_gnss_synchro->Acq_samplestamp_samples = 0ULL; + d_gnss_synchro->Acq_doppler_step = 0U; + d_well_count = 0; + d_mag = 0.0; + d_input_power = 0.0; + d_test_statistics = 0.0; + d_state = 1; break; } case 1: diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h index f92defb17..c02fdd442 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h @@ -103,16 +103,14 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int state) override; - /*! * \brief Set acquisition channel unique ID * \param channel - receiver channel. diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 01b67a069..1da8066e5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -146,58 +146,33 @@ void galileo_pcps_8ms_acquisition_cc::init() } -void galileo_pcps_8ms_acquisition_cc::set_state(int32_t state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { int32_t acquisition_message = -1; // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL + if (!d_active) + { + d_sample_counter += static_cast(d_fft_size) * ninput_items[0]; // sample counter + consume_each(ninput_items[0]); + return 0; + } + switch (d_state) { case 0: { - if (d_active) - { - // restart acquisition variables - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - - d_state = 1; - } - - d_sample_counter += static_cast(d_fft_size) * ninput_items[0]; // sample counter - consume_each(ninput_items[0]); - + // restart acquisition variables + d_gnss_synchro->Acq_delay_samples = 0.0; + d_gnss_synchro->Acq_doppler_hz = 0.0; + d_gnss_synchro->Acq_samplestamp_samples = 0ULL; + d_gnss_synchro->Acq_doppler_step = 0U; + d_well_count = 0; + d_mag = 0.0; + d_input_power = 0.0; + d_test_statistics = 0.0; + d_state = 1; break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h index eb9f7c7c3..bcef9e661 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h @@ -92,16 +92,14 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int32_t state) override; - /*! * \brief Set acquisition channel unique ID * \param channel - receiver channel. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index 6f23ce95d..9f4d27d3e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -303,29 +303,6 @@ void pcps_acquisition::update_grid_doppler_wipeoffs_step2() } -void pcps_acquisition::set_state(int32_t state) -{ - gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_mag = 0.0; - d_active = true; - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - void pcps_acquisition::send_positive_acquisition(float test_statistics) { // Declare positive acquisition using a message port @@ -916,11 +893,6 @@ int pcps_acquisition::general_work(int noutput_items __attribute__((unused)), d_mag = 0.0; d_state = 1; d_buffer_count = 0U; - if (!d_acq_parameters.blocking_on_standby) - { - d_sample_counter += static_cast(ninput_items[0]); // sample counter - consume_each(ninput_items[0]); - } break; } case 1: diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h index 19374f488..e8d86d53c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h @@ -117,13 +117,6 @@ public: */ void set_local_code(std::complex* code) override; - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int32_t state) override; - void set_resampler_latency(uint32_t latency_samples); /*! diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc index bafe69dcf..9b8c21280 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc @@ -411,32 +411,6 @@ bool pcps_acquisition_fine_doppler_cc::start() } -void pcps_acquisition_fine_doppler_cc::set_state(int state) -{ - // gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler - d_state = state; - - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_test_statistics = 0.0; - d_active = true; - reset_grid(); - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items, gr_vector_int &ninput_items __attribute__((unused)), gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -458,20 +432,26 @@ int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items, int return_value = 0; // Number of Gnss_Syncro objects produced int samples_remaining; const auto *in_aux = reinterpret_cast(input_items[0]); + + if (!d_active) + { + d_sample_counter += static_cast(d_fft_size); // sample counter + consume_each(ninput_items[0]); + return 0; + } + switch (d_state) { case 0: // S0. StandBy - if (d_active == true) - { - reset_grid(); - d_n_samples_in_buffer = 0; - d_state = 1; - } - if (!d_acq_params.blocking_on_standby) - { - d_sample_counter += static_cast(d_fft_size); // sample counter - consume_each(d_fft_size); - } + d_gnss_synchro->Acq_delay_samples = 0.0; + d_gnss_synchro->Acq_doppler_hz = 0.0; + d_gnss_synchro->Acq_samplestamp_samples = 0ULL; + d_gnss_synchro->Acq_doppler_step = 0U; + d_well_count = 0; + d_test_statistics = 0.0; + reset_grid(); + d_n_samples_in_buffer = 0; + d_state = 1; break; case 1: // S1. ComputeGrid compute_and_accumulate_grid(input_items); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h index f23902155..3b468a426 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h @@ -115,6 +115,11 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } @@ -146,13 +151,6 @@ public: d_threshold = threshold; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int state) override; - /*! * \brief Parallel Code Phase Search Acquisition signal processing. */ diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 4b0ceb177..a55242c0b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -325,15 +325,17 @@ int pcps_assisted_acquisition_cc::general_work(int noutput_items, * S5. Negative_Acq: Send message and stop acq -> S0 */ + if (!d_active) + { + d_sample_counter += static_cast(ninput_items[0]); // sample counter + consume_each(ninput_items[0]); + return 0; + } + switch (d_state) { case 0: // S0. StandBy - if (d_active == true) - { - d_state = 1; - } - d_sample_counter += static_cast(ninput_items[0]); // sample counter - consume_each(ninput_items[0]); + d_state = 1; break; case 1: // S1. GetAssist get_assistance(); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h index 0761a980a..0ee5c7e8b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -109,6 +109,11 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } @@ -139,11 +144,6 @@ public: d_threshold = threshold; } - inline void set_state(int32_t state) override - { - d_state = state; - } - /*! * \brief Parallel Code Phase Search Acquisition signal processing. */ diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index 5fcbc5b92..1fe38d07a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -153,58 +153,33 @@ void pcps_cccwsr_acquisition_cc::init() } -void pcps_cccwsr_acquisition_cc::set_state(int32_t state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { int32_t acquisition_message = -1; // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL + if (!d_active) + { + d_sample_counter += static_cast(d_fft_size) * ninput_items[0]; // sample counter + consume_each(ninput_items[0]); + return 0; + } + switch (d_state) { case 0: { - if (d_active) - { - // restart acquisition variables - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - - d_state = 1; - } - - d_sample_counter += static_cast(d_fft_size) * ninput_items[0]; // sample counter - consume_each(ninput_items[0]); - + // restart acquisition variables + d_gnss_synchro->Acq_delay_samples = 0.0; + d_gnss_synchro->Acq_doppler_hz = 0.0; + d_gnss_synchro->Acq_samplestamp_samples = 0ULL; + d_gnss_synchro->Acq_doppler_step = 0U; + d_well_count = 0; + d_mag = 0.0; + d_input_power = 0.0; + d_test_statistics = 0.0; + d_state = 1; break; } case 1: diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h index ab9bb05ba..ea53581bd 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -97,16 +97,14 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int32_t state) override; - /*! * \brief Set acquisition channel unique ID * \param channel - receiver channel. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 284a1d1ec..5783c4019 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -604,32 +604,6 @@ void pcps_opencl_acquisition_cc::acquisition_core_opencl() } -void pcps_opencl_acquisition_cc::set_state(int state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - d_in_dwell_count = 0; - d_sample_counter_buffer.clear(); - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - int pcps_opencl_acquisition_cc::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h index cf156c742..db0aedb50 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -116,16 +116,14 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int state) override; - /*! * \brief Set acquisition channel unique ID * \param channel - receiver channel. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index 78cabe078..44c9dd5fe 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -161,30 +161,6 @@ void pcps_quicksync_acquisition_cc::init() } -void pcps_quicksync_acquisition_cc::set_state(int32_t state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - d_active = true; - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - int pcps_quicksync_acquisition_cc::general_work(int noutput_items, gr_vector_int& ninput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) @@ -201,29 +177,29 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items, */ // DLOG(INFO) << "START GENERAL WORK"; int32_t acquisition_message = -1; // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL + + if (!d_active) + { + d_sample_counter += static_cast(d_vector_length) * ninput_items[0]; // sample counter + consume_each(ninput_items[0]); + return 0; + } + switch (d_state) { case 0: { - // DLOG(INFO) << "START CASE 0"; - if (d_active) - { - // restart acquisition variables - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_well_count = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; + // restart acquisition variables + d_gnss_synchro->Acq_delay_samples = 0.0; + d_gnss_synchro->Acq_doppler_hz = 0.0; + d_gnss_synchro->Acq_samplestamp_samples = 0ULL; + d_gnss_synchro->Acq_doppler_step = 0U; + d_well_count = 0; + d_mag = 0.0; + d_input_power = 0.0; + d_test_statistics = 0.0; - d_state = 1; - } - - d_sample_counter += static_cast(d_vector_length) * ninput_items[0]; // sample counter - consume_each(ninput_items[0]); - // DLOG(INFO) << "END CASE 0"; + d_state = 1; break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h index 1248373a1..5e77c97e2 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -115,16 +115,14 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int32_t state) override; - /*! * \brief Set acquisition channel unique ID * \param channel - receiver channel. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index 25af6612c..1f76df615 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -163,76 +163,43 @@ void pcps_tong_acquisition_cc::init() } -void pcps_tong_acquisition_cc::set_state(int32_t state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_dwell_count = 0; - d_tong_count = d_tong_init_val; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - - for (uint32_t doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++) - { - for (uint32_t i = 0; i < d_fft_size; i++) - { - d_grid_data[doppler_index][i] = 0.0; - } - } - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - - int pcps_tong_acquisition_cc::general_work(int noutput_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { int32_t acquisition_message = -1; // 0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL + if (!d_active) + { + d_sample_counter += static_cast(d_fft_size) * ninput_items[0]; // sample counter + consume_each(ninput_items[0]); + return 0; + } + switch (d_state) { case 0: { - if (d_active) + // restart acquisition variables + d_gnss_synchro->Acq_delay_samples = 0.0; + d_gnss_synchro->Acq_doppler_hz = 0.0; + d_gnss_synchro->Acq_samplestamp_samples = 0ULL; + d_gnss_synchro->Acq_doppler_step = 0U; + d_dwell_count = 0; + d_tong_count = d_tong_init_val; + d_mag = 0.0; + d_input_power = 0.0; + d_test_statistics = 0.0; + + for (uint32_t doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++) { - // restart acquisition variables - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0ULL; - d_gnss_synchro->Acq_doppler_step = 0U; - d_dwell_count = 0; - d_tong_count = d_tong_init_val; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - - for (uint32_t doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++) + for (uint32_t i = 0; i < d_fft_size; i++) { - for (uint32_t i = 0; i < d_fft_size; i++) - { - d_grid_data[doppler_index][i] = 0.0; - } + d_grid_data[doppler_index][i] = 0.0; } - - d_state = 1; } - d_sample_counter += static_cast(d_fft_size) * ninput_items[0]; // sample counter - consume_each(ninput_items[0]); - + d_state = 1; break; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h index 191ce62b5..89dac01a7 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -114,16 +114,14 @@ public: */ inline void set_active(bool active) override { + if (!active) + { + d_state = 0; + } + d_active = active; } - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int32_t state) override; - /*! * \brief Set acquisition channel unique ID * \param channel - receiver channel. diff --git a/src/core/interfaces/acquisition_interface.h b/src/core/interfaces/acquisition_interface.h index 7581f0f0d..58fd0d626 100644 --- a/src/core/interfaces/acquisition_interface.h +++ b/src/core/interfaces/acquisition_interface.h @@ -57,7 +57,6 @@ public: virtual void set_doppler_center(int /*doppler_center*/) {} virtual void init() = 0; virtual void set_local_code() = 0; - virtual void set_state(int state) = 0; virtual signed int mag() = 0; virtual void reset() = 0; virtual void stop_acquisition() = 0; diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc index 509a58c44..461fde340 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc @@ -593,7 +593,6 @@ void AcquisitionPerformanceTest::process_message() { measurement_counter++; acquisition->reset(); - acquisition->set_state(1); std::cout << "Progress: " << round(static_cast(measurement_counter) / static_cast(num_of_measurements) * 100.0) << "% \r" << std::flush; if (measurement_counter == num_of_measurements) { @@ -857,8 +856,8 @@ int AcquisitionPerformanceTest::run_receiver() acquisition->set_threshold(config->property("Acquisition.threshold", 0.0)); acquisition->init(); acquisition->set_local_code(); + acquisition->reset(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample acquisition->connect(top_block); acquisition->reset(); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc index 27d0c631e..ce0c626f5 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc @@ -249,7 +249,7 @@ void BeidouB1iPcpsAcquisitionTest::plot_grid() TEST_F(BeidouB1iPcpsAcquisitionTest, Instantiate) { init(); - std::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition_B1", 1, 0); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition_B1", 1, 0); } @@ -263,7 +263,7 @@ TEST_F(BeidouB1iPcpsAcquisitionTest, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); init(); - std::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition_B1", 1, 0); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition_B1", 1, 0); std::shared_ptr msg_rx = BeidouB1iPcpsAcquisitionTest_msg_rx_make(); ASSERT_NO_THROW({ @@ -336,8 +336,8 @@ TEST_F(BeidouB1iPcpsAcquisitionTest, ValidationOfResults) }) << "Failure connecting the blocks of acquisition test."; acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample acquisition->init(); + acquisition->reset(); EXPECT_NO_THROW({ start = std::chrono::system_clock::now(); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc index 9794be0c1..1f556fa27 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc @@ -247,7 +247,7 @@ void BeidouB3iPcpsAcquisitionTest::plot_grid() TEST_F(BeidouB3iPcpsAcquisitionTest, Instantiate) { init(); - std::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition_B3", 1, 0); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition_B3", 1, 0); } @@ -261,7 +261,7 @@ TEST_F(BeidouB3iPcpsAcquisitionTest, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); init(); - std::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition_B3", 1, 0); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition_B3", 1, 0); std::shared_ptr msg_rx = BeidouB3iPcpsAcquisitionTest_msg_rx_make(); ASSERT_NO_THROW({ @@ -334,7 +334,7 @@ TEST_F(BeidouB3iPcpsAcquisitionTest, ValidationOfResults) }) << "Failure connecting the blocks of acquisition test."; acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); acquisition->init(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index c2215e3f6..f7e0bef1f 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -533,7 +533,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) } acquisition->set_local_code(); - // acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ @@ -614,7 +614,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProb } acquisition->set_local_code(); - // acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index 480e20e5b..dd2603098 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -515,7 +515,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) } acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ @@ -589,7 +589,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProbabi } acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index cb2c2d5b5..902ed09da 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -294,7 +294,6 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoCTest, ValidationOfResults) acquisition->set_local_code(); acquisition->init(); acquisition->reset(); - acquisition->set_state(1); }) << "Failure starting acquisition"; EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index 66762b90b..aa8da60c9 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -352,7 +352,6 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) acquisition->set_local_code(); acquisition->init(); acquisition->reset(); - acquisition->set_state(1); EXPECT_NO_THROW({ start = std::chrono::system_clock::now(); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index 1146d5465..b3656a287 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -524,7 +524,6 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); acquisition->reset(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ @@ -612,7 +611,6 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResultsProbabili acquisition->init(); acquisition->reset(); acquisition->set_local_code(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index a9440eaaf..1d2af7ef4 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -676,7 +676,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); acquisition->reset(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ @@ -705,6 +704,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul { LOG(INFO) << "Start validation of results with noise+interference test"; config_3(); + config->set_property("Acquisition_1B.blocking_on_standby", "true"); // Ensure that acquisition starts at the first sample top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); @@ -758,7 +758,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); acquisition->reset(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ @@ -784,6 +783,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResultsProbabilities) { config_2(); + config->set_property("Acquisition_1B.blocking_on_standby", "true"); // Ensure that acquisition starts at the first sample top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); @@ -838,7 +838,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); acquisition->reset(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index 0a1fcf800..cfd37b972 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -522,7 +522,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) acquisition->reset(); acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ @@ -551,6 +551,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) { config_2(); + config->set_property("Acquisition_1B.blocking_on_standby", "true"); // Ensure that acquisition starts at the first sample top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); @@ -602,7 +603,6 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsPro } acquisition->set_local_code(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 1ed380fa1..dfa3bd56e 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -630,7 +630,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM) acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index 51611bdd2..68d8994f9 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -416,7 +416,7 @@ TEST_F(GalileoE5bPcpsAcquisitionTest, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc index d0eacb7ec..6bec27e2f 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e6_pcps_acquisition_test.cc @@ -411,7 +411,7 @@ TEST_F(GalileoE6PcpsAcquisitionTest, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc index fa1ff08df..1f8826627 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc @@ -522,7 +522,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResults) } acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc index 6e402c016..5e2282c95 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc @@ -243,7 +243,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionTest, ValidationOfResults) }) << "Failure connecting acquisition to the top_block."; acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); acquisition->init(); ASSERT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc index ef54ee01b..941c9f7ee 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc @@ -524,7 +524,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResults) } acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index 319859e1c..a3598ea8e 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -514,7 +514,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults) } acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index 06e5eb033..69c834774 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -347,8 +347,8 @@ TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ValidationOfResults /*unused*/) }) << "Failure connecting the blocks of acquisition test."; acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample acquisition->init(); + acquisition->reset(); EXPECT_NO_THROW({ start = std::chrono::system_clock::now(); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 5e41d33ad..80e1a83ca 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -649,7 +649,6 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResults) acquisition->reset(); acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ @@ -734,7 +733,6 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsWithNoise acquisition->reset(); acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ @@ -813,7 +811,6 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili acquisition->reset(); acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->set_state(1); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index cd7292e2e..ebff4ecd3 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -514,7 +514,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResults) } acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); @@ -595,7 +595,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) } acquisition->set_local_code(); - acquisition->set_state(1); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc index 84cb20e3a..617bf8d5d 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc @@ -355,8 +355,8 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) ASSERT_NO_THROW({ acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample acquisition->init(); + acquisition->reset(); }) << "Failure set_state and init acquisition test"; EXPECT_NO_THROW({ diff --git a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index baf2b1c90..2d403c961 100644 --- a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -549,7 +549,7 @@ bool HybridObservablesTest::acquire_signal() #endif acquisition->init(); acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); acquisition->connect(top_block_acq); gr::blocks::file_source::sptr file_source; @@ -695,7 +695,6 @@ bool HybridObservablesTest::acquire_signal() acquisition->init(); acquisition->set_local_code(); acquisition->reset(); - acquisition->set_state(1); msg_rx->rx_message = 0; top_block_acq->run(); if (start_msg == true) diff --git a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index 84f10a2d8..6d476468f 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -542,7 +542,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID) #endif acquisition->init(); acquisition->set_local_code(); - acquisition->set_state(1); // Ensure that acquisition starts at the first sample + acquisition->reset(); acquisition->connect(top_block_acq); gr::blocks::file_source::sptr file_source; @@ -691,7 +691,6 @@ bool TrackingPullInTest::acquire_signal(int SV_ID) acquisition->init(); acquisition->set_local_code(); acquisition->reset(); - acquisition->set_state(1); msg_rx->rx_message = 0; top_block_acq->run(); if (start_msg == true) From 3f1a08f25cedf9ad7e4cc82e9857d035cf0827c8 Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Thu, 13 Nov 2025 18:12:13 +0000 Subject: [PATCH 2/4] Woops --- .../galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index cfd37b972..90bc0b84f 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -522,7 +522,6 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) acquisition->reset(); acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_local_code(); - acquisition->reset(); start_queue(); EXPECT_NO_THROW({ From 2f5b19c7691613b4aea8787ebcd1123d83edaf6f Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Thu, 13 Nov 2025 19:01:00 +0000 Subject: [PATCH 3/4] Forgot that --- .../gnuradio_blocks/pcps_acquisition_fpga.cc | 22 ------------------- .../gnuradio_blocks/pcps_acquisition_fpga.h | 7 ------ 2 files changed, 29 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index cf0ff02bd..64cf8b17a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -87,28 +87,6 @@ void pcps_acquisition_fpga::init() d_input_power = 0.0; } -void pcps_acquisition_fpga::set_state(int32_t state) -{ - d_state = state; - if (d_state == 1) - { - d_gnss_synchro->Acq_delay_samples = 0.0; - d_gnss_synchro->Acq_doppler_hz = 0.0; - d_gnss_synchro->Acq_samplestamp_samples = 0; - d_mag = 0.0; - d_input_power = 0.0; - d_test_statistics = 0.0; - d_active = true; - } - else if (d_state == 0) - { - } - else - { - LOG(ERROR) << "State can only be set to 0 or 1"; - } -} - void pcps_acquisition_fpga::send_positive_acquisition() { diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index 2fa9e3290..3b826822a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -91,13 +91,6 @@ public: */ void set_local_code(); - /*! - * \brief If set to 1, ensures that acquisition starts at the - * first available sample. - * \param state - int=1 forces start of acquisition - */ - void set_state(int32_t state); - /*! * \brief Starts acquisition algorithm, turning from standby mode to * active mode From fba65ba85f19a61900c1698517f3487524b8925a Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Fri, 14 Nov 2025 12:04:13 +0000 Subject: [PATCH 4/4] Cleanup --- ...leo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 2 -- .../galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index 1d2af7ef4..eb1f7dfe3 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -704,7 +704,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul { LOG(INFO) << "Start validation of results with noise+interference test"; config_3(); - config->set_property("Acquisition_1B.blocking_on_standby", "true"); // Ensure that acquisition starts at the first sample top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); @@ -783,7 +782,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResultsProbabilities) { config_2(); - config->set_property("Acquisition_1B.blocking_on_standby", "true"); // Ensure that acquisition starts at the first sample top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index 90bc0b84f..6926bddf5 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -550,7 +550,6 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) { config_2(); - config->set_property("Acquisition_1B.blocking_on_standby", "true"); // Ensure that acquisition starts at the first sample top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); @@ -602,6 +601,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsPro } acquisition->set_local_code(); + acquisition->reset(); start_queue(); EXPECT_NO_THROW({