From 10a75f1ab212eeb086e46460ac9d909215f554d9 Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Tue, 4 Nov 2025 21:57:31 +0000 Subject: [PATCH 1/4] Make acquisition doppler max const --- .../acquisition/adapters/base_pcps_acquisition.cc | 6 ------ .../acquisition/adapters/base_pcps_acquisition.h | 5 ----- .../adapters/base_pcps_acquisition_fpga.cc | 9 --------- .../adapters/base_pcps_acquisition_fpga.h | 1 - .../galileo_e1_pcps_8ms_ambiguous_acquisition.cc | 11 ----------- .../galileo_e1_pcps_8ms_ambiguous_acquisition.h | 5 ----- .../galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 11 ----------- .../galileo_e1_pcps_cccwsr_ambiguous_acquisition.h | 5 ----- ...alileo_e1_pcps_quicksync_ambiguous_acquisition.cc | 11 ----------- ...galileo_e1_pcps_quicksync_ambiguous_acquisition.h | 5 ----- .../galileo_e1_pcps_tong_ambiguous_acquisition.cc | 11 ----------- .../galileo_e1_pcps_tong_ambiguous_acquisition.h | 5 ----- .../galileo_e5a_noncoherent_iq_acquisition_caf.cc | 11 ----------- .../galileo_e5a_noncoherent_iq_acquisition_caf.h | 5 ----- .../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 7 ------- .../gps_l1_ca_pcps_acquisition_fine_doppler.h | 5 ----- .../adapters/gps_l1_ca_pcps_assisted_acquisition.cc | 6 ------ .../adapters/gps_l1_ca_pcps_assisted_acquisition.h | 5 ----- .../adapters/gps_l1_ca_pcps_opencl_acquisition.cc | 10 ---------- .../adapters/gps_l1_ca_pcps_opencl_acquisition.h | 5 ----- .../adapters/gps_l1_ca_pcps_quicksync_acquisition.cc | 10 ---------- .../adapters/gps_l1_ca_pcps_quicksync_acquisition.h | 5 ----- .../adapters/gps_l1_ca_pcps_tong_acquisition.cc | 10 ---------- .../adapters/gps_l1_ca_pcps_tong_acquisition.h | 5 ----- .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 9 --------- .../galileo_pcps_8ms_acquisition_cc.h | 9 --------- .../acquisition/gnuradio_blocks/pcps_acquisition.cc | 3 ++- .../acquisition/gnuradio_blocks/pcps_acquisition.h | 12 +----------- .../pcps_acquisition_fine_doppler_cc.h | 9 --------- .../gnuradio_blocks/pcps_acquisition_fpga.h | 10 ---------- .../gnuradio_blocks/pcps_assisted_acquisition_cc.h | 9 --------- .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 9 --------- .../gnuradio_blocks/pcps_opencl_acquisition_cc.h | 9 --------- .../gnuradio_blocks/pcps_quicksync_acquisition_cc.h | 9 --------- .../gnuradio_blocks/pcps_tong_acquisition_cc.h | 9 --------- src/algorithms/acquisition/libs/fpga_acquisition.h | 9 --------- src/core/interfaces/acquisition_interface.h | 1 - .../acquisition/acq_performance_test.cc | 1 - .../acquisition/beidou_b1i_pcps_acquisition_test.cc | 4 ---- .../acquisition/beidou_b3i_pcps_acquisition_test.cc | 4 ---- ...1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 12 ------------ ...eo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 8 -------- ...alileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 6 +----- .../galileo_e1_pcps_ambiguous_acquisition_test.cc | 4 ---- ...alileo_e1_pcps_ambiguous_acquisition_test_fpga.cc | 1 - ...cps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 8 -------- ..._quicksync_ambiguous_acquisition_gsoc2014_test.cc | 12 ------------ ..._pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 8 -------- ...o_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 4 ---- .../acquisition/galileo_e5b_pcps_acquisition_test.cc | 4 ---- .../acquisition/galileo_e6_pcps_acquisition_test.cc | 4 ---- .../glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 8 -------- .../glonass_l1_ca_pcps_acquisition_test.cc | 4 ---- .../glonass_l2_ca_pcps_acquisition_test.cc | 8 -------- .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 8 -------- .../acquisition/gps_l1_ca_pcps_acquisition_test.cc | 4 ---- .../gps_l1_ca_pcps_acquisition_test_fpga.cc | 1 - ...ps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 8 -------- ...l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 8 -------- .../gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 8 -------- .../acquisition/gps_l2_m_pcps_acquisition_test.cc | 4 ---- .../observables/hybrid_observables_test.cc | 2 -- .../observables/hybrid_observables_test_fpga.cc | 2 -- .../tracking/tracking_pull-in_test.cc | 2 -- .../tracking/tracking_pull-in_test_fpga.cc | 2 -- utils/front-end-cal/main.cc | 2 +- 66 files changed, 5 insertions(+), 422 deletions(-) diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc index 09b5c89f0..1e17a9785 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition.cc @@ -109,12 +109,6 @@ void BasePcpsAcquisition::set_threshold(float threshold) } -void BasePcpsAcquisition::set_doppler_max(unsigned int doppler_max) -{ - acquisition_->set_doppler_max(doppler_max); -} - - void BasePcpsAcquisition::set_doppler_step(unsigned int doppler_step) { acquisition_->set_doppler_step(doppler_step); diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition.h b/src/algorithms/acquisition/adapters/base_pcps_acquisition.h index e1da2523b..fd7b09b7d 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition.h @@ -98,11 +98,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc index 37ef51d68..21a4ef22e 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.cc @@ -158,15 +158,6 @@ void BasePcpsAcquisitionFpga::set_threshold(float threshold) } -void BasePcpsAcquisitionFpga::set_doppler_max(unsigned int doppler_max) -{ - if (acquisition_fpga_) - { - acquisition_fpga_->set_doppler_max(doppler_max); - } -} - - void BasePcpsAcquisitionFpga::set_doppler_step(unsigned int doppler_step) { 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 55b9f98cb..d6a35dabf 100644 --- a/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/base_pcps_acquisition_fpga.h @@ -71,7 +71,6 @@ public: void set_channel(unsigned int channel) override; void set_channel_fsm(std::weak_ptr channel_fsm) override; void set_threshold(float threshold) override; - void set_doppler_max(unsigned int doppler_max) override; void set_doppler_step(unsigned int doppler_step) override; void set_doppler_center(int doppler_center) override; void set_state(int state) override; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index 899fabd91..02d611041 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -157,17 +157,6 @@ void GalileoE1Pcps8msAmbiguousAcquisition::set_threshold(float threshold) } -void GalileoE1Pcps8msAmbiguousAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GalileoE1Pcps8msAmbiguousAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index ccbf8d403..28f9aa043 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -102,11 +102,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index 622de4ce1..fdc547f5a 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -135,17 +135,6 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisition::set_threshold(float threshold) } -void GalileoE1PcpsCccwsrAmbiguousAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GalileoE1PcpsCccwsrAmbiguousAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index 8012fde8f..9abdc9437 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -103,11 +103,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index 10e4137fe..d2f7ae1ee 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -190,17 +190,6 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_threshold(float threshold) } -void GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index e78ee5481..14cd7788d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -103,11 +103,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index b028ed9cd..a90e3107d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -163,17 +163,6 @@ void GalileoE1PcpsTongAmbiguousAcquisition::set_threshold(float threshold) } -void GalileoE1PcpsTongAmbiguousAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GalileoE1PcpsTongAmbiguousAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index 208bc1f4c..f78b2c801 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -103,11 +103,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index 8ca4e0d7f..a387ebf5d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -170,17 +170,6 @@ void GalileoE5aNoncoherentIQAcquisitionCaf::set_threshold(float threshold) } -void GalileoE5aNoncoherentIQAcquisitionCaf::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GalileoE5aNoncoherentIQAcquisitionCaf::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index ccea01d84..ce44ac665 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -103,11 +103,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc index 82d91bf58..a716952ea 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc @@ -116,13 +116,6 @@ void GpsL1CaPcpsAcquisitionFineDoppler::set_threshold(float threshold) } -void GpsL1CaPcpsAcquisitionFineDoppler::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = static_cast(doppler_max); - acquisition_cc_->set_doppler_max(doppler_max_); -} - - void GpsL1CaPcpsAcquisitionFineDoppler::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h index 4a9091262..edd67c08f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h @@ -105,11 +105,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc index b44f875ce..0a24d58fc 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc @@ -108,12 +108,6 @@ void GpsL1CaPcpsAssistedAcquisition::set_threshold(float threshold) } -void GpsL1CaPcpsAssistedAcquisition::set_doppler_max(unsigned int doppler_max) -{ - acquisition_cc_->set_doppler_max(doppler_max); -} - - void GpsL1CaPcpsAssistedAcquisition::set_doppler_step(unsigned int doppler_step) { acquisition_cc_->set_doppler_step(doppler_step); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h index 6479ba8ae..8e92657e8 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h @@ -102,11 +102,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc index ccf1b20dd..31fea8d6f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc @@ -155,16 +155,6 @@ void GpsL1CaPcpsOpenClAcquisition::set_threshold(float threshold) } -void GpsL1CaPcpsOpenClAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GpsL1CaPcpsOpenClAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index a7668ca5d..89168b4da 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -102,11 +102,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc index 3075d8df1..b6c519ecb 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc @@ -187,16 +187,6 @@ void GpsL1CaPcpsQuickSyncAcquisition::set_threshold(float threshold) } -void GpsL1CaPcpsQuickSyncAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GpsL1CaPcpsQuickSyncAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index a62ab64b6..de5f287bc 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -105,11 +105,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc index eeba200c3..9598468f3 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc @@ -143,16 +143,6 @@ void GpsL1CaPcpsTongAcquisition::set_threshold(float threshold) } -void GpsL1CaPcpsTongAcquisition::set_doppler_max(unsigned int doppler_max) -{ - doppler_max_ = doppler_max; - if (item_type_ == "gr_complex") - { - acquisition_cc_->set_doppler_max(doppler_max_); - } -} - - void GpsL1CaPcpsTongAcquisition::set_doppler_step(unsigned int doppler_step) { doppler_step_ = doppler_step; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index 1cde8432d..2c283b88d 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -103,11 +103,6 @@ public: */ void set_threshold(float threshold) override; - /*! - * \brief Set maximum Doppler off grid search - */ - void set_doppler_max(unsigned int doppler_max) override; - /*! * \brief Set Doppler steps for the grid search */ 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 f3230ae74..1d881f7d7 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 @@ -145,15 +145,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(unsigned int doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. 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 6ed5200cf..0791c39e3 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 @@ -135,15 +135,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index 0b5e286a3..1c82aad22 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -414,7 +414,8 @@ void pcps_acquisition::dump_results(int32_t effective_fft_size, float test_stati dims[0] = static_cast(1); dims[1] = static_cast(1); - matvar = Mat_VarCreate("doppler_max", MAT_C_INT32, MAT_T_INT32, 1, dims.data(), &d_doppler_max, 0); + auto doppler_max = d_doppler_max; + matvar = Mat_VarCreate("doppler_max", MAT_C_INT32, MAT_T_INT32, 1, dims.data(), &doppler_max, 0); Mat_VarWrite(matfp, matvar, MAT_COMPRESSION_ZLIB); // or MAT_COMPRESSION_NONE Mat_VarFree(matvar); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h index 58b932f35..7e6ab99d2 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h @@ -172,16 +172,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. @@ -253,7 +243,7 @@ private: float d_mag; float d_input_power; float d_doppler_center_step_two; - float d_doppler_max; + const float d_doppler_max; int32_t d_state; int32_t d_positive_acq; 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 d9c073e01..0f6b8d3c5 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 @@ -145,15 +145,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(unsigned int doppler_max) - { - d_config_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index d1fca2179..b4d291271 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -132,16 +132,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - d_acquisition_fpga->set_doppler_max(doppler_max); - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. 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 4115130f2..d4386b1b4 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -151,15 +151,6 @@ public: d_state = state; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. 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 83582cb42..d7bd9c8e7 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -141,15 +141,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. 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 caea4ffcc..af65ebae2 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -161,15 +161,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. 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 44bb5cfb7..787042e3f 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -162,15 +162,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. 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 2f3f9f498..0bf261ab1 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -156,15 +156,6 @@ public: d_threshold = threshold; } - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - inline void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.h b/src/algorithms/acquisition/libs/fpga_acquisition.h index 4cada480b..6f43084ab 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.h +++ b/src/algorithms/acquisition/libs/fpga_acquisition.h @@ -87,15 +87,6 @@ public: uint32_t *doppler_index, uint32_t *total_blk_exp); - /*! - * \brief Set maximum Doppler grid search - * \param doppler_max - Maximum Doppler shift considered in the grid search [Hz]. - */ - void set_doppler_max(uint32_t doppler_max) - { - d_doppler_max = doppler_max; - } - /*! * \brief Set Doppler steps for the grid search * \param doppler_step - Frequency bin of the search grid [Hz]. diff --git a/src/core/interfaces/acquisition_interface.h b/src/core/interfaces/acquisition_interface.h index f72aabce3..cc23b3f0a 100644 --- a/src/core/interfaces/acquisition_interface.h +++ b/src/core/interfaces/acquisition_interface.h @@ -54,7 +54,6 @@ public: virtual void set_channel(unsigned int channel_id) = 0; virtual void set_channel_fsm(std::weak_ptr channel_fsm) = 0; virtual void set_threshold(float threshold) = 0; - virtual void set_doppler_max(unsigned int doppler_max) = 0; virtual void set_doppler_step(unsigned int doppler_step) = 0; virtual void set_doppler_center(int doppler_center __attribute__((unused))) { 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 6406f42b2..602045545 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 @@ -854,7 +854,6 @@ int AcquisitionPerformanceTest::run_receiver() acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_channel(0); - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", 10000)); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", 500)); acquisition->set_threshold(config->property("Acquisition.threshold", 0.0)); acquisition->init(); 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 2ba96d9b1..055a77b46 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 @@ -322,10 +322,6 @@ TEST_F(BeidouB1iPcpsAcquisitionTest, ValidationOfResults) acquisition->set_threshold(0.0038); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(doppler_max); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(doppler_step); }) << "Failure setting doppler_step."; 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 b96f9427d..a3e172988 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 @@ -320,10 +320,6 @@ TEST_F(BeidouB3iPcpsAcquisitionTest, ValidationOfResults) acquisition->set_threshold(0.0002); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(doppler_max); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(doppler_step); }) << "Failure setting doppler_step."; 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 b32ffd73f..031911b9d 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 @@ -456,10 +456,6 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ConnectAndRun) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; @@ -506,10 +502,6 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; @@ -593,10 +585,6 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProb acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 0c85d0edd..4d574c1c6 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 @@ -484,10 +484,6 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; @@ -564,10 +560,6 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProbabi acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 3d94da8a1..223c141f7 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 @@ -174,7 +174,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::init() // config->set_property("Acquisition_1B.threshold", "2.5"); config->set_property("Acquisition_1B.pfa", "0.001"); config->set_property("Acquisition_1B.doppler_max", "10000"); - config->set_property("Acquisition_1B.doppler_step", "125"); + config->set_property("Acquisition_1B.doppler_step", "250"); config->set_property("Acquisition_1B.repeat_satellite", "false"); config->set_property("Acquisition_1B.cboc", "true"); } @@ -275,10 +275,6 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoCTest, ValidationOfResults) acquisition->set_threshold(config->property("Acquisition_1B.threshold", 0.00001)); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 250)); }) << "Failure setting doppler_step."; 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 dab5dd729..2878dd396 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 @@ -336,10 +336,6 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) acquisition->set_threshold(config->property("Acquisition_1B.threshold", 1e-9)); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", doppler_max)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", doppler_step)); }) << "Failure setting doppler_step."; diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc index 4d68363f8..e98c971ee 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc @@ -335,7 +335,6 @@ bool GalileoE1PcpsAmbiguousAcquisitionTestFpga::acquire_signal() acquisition->set_gnss_synchro(&tmp_gnss_synchro); acquisition->set_channel_fsm(channel_fsm_); acquisition->set_channel(1); - acquisition->set_doppler_max(doppler_max); acquisition->set_doppler_step(doppler_step); acquisition->set_doppler_center(0); acquisition->set_threshold(0.001); 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 665de9628..ad6d2fc2d 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 @@ -487,10 +487,6 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; @@ -579,10 +575,6 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResultsProbabili acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 9f17437c0..cc0c44578 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 @@ -638,10 +638,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 125)); }) << "Failure setting doppler_step."; @@ -728,10 +724,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(50); }) << "Failure setting doppler_step."; @@ -815,10 +807,6 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 410788d2e..598cd7e95 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 @@ -485,10 +485,6 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(5000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(100); }) << "Failure setting doppler_step."; @@ -573,10 +569,6 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsPro acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1B.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1B.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 44b7d3ef5..ebc49dfad 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 @@ -585,10 +585,6 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_5X.doppler_max", 5000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_5X.doppler_step", 100)); }) << "Failure setting doppler_step."; 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 66bc9cf3c..200c803db 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 @@ -377,10 +377,6 @@ TEST_F(GalileoE5bPcpsAcquisitionTest, ValidationOfResults) acquisition->set_threshold(0.0001); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(5000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(100); }) << "Failure setting doppler_step."; 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 f503967bf..6361b0e3c 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 @@ -372,10 +372,6 @@ TEST_F(GalileoE6PcpsAcquisitionTest, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(5000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(100); }) << "Failure setting doppler_step."; 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 334e1baae..44373637e 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 @@ -491,10 +491,6 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(10000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(500); }) << "Failure setting doppler_step."; @@ -573,10 +569,6 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResultsProbabilities) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 235ec87cd..9c9599d8b 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 @@ -238,10 +238,6 @@ TEST_F(GlonassL1CaPcpsAcquisitionTest, ValidationOfResults) acquisition->set_threshold(0.005); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(10000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(500); }) << "Failure setting doppler_step."; 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 35d1e4c8c..812020ac3 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 @@ -489,10 +489,6 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(10000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(500); }) << "Failure setting doppler_step."; @@ -575,10 +571,6 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResultsProbabilities) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_2G.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_2G.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 2d0e4f04f..f741e60c2 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 @@ -483,10 +483,6 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(10000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(500); }) << "Failure setting doppler_step."; @@ -565,10 +561,6 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1C.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1C.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 3aeff2872..9477a0c61 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 @@ -333,10 +333,6 @@ TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ValidationOfResults /*unused*/) acquisition->set_threshold(0.001); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(doppler_max); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(doppler_step); }) << "Failure setting doppler_step."; diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc index 47ddc54aa..749eb72dd 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc @@ -334,7 +334,6 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal() acquisition->set_gnss_synchro(&tmp_gnss_synchro); acquisition->set_channel_fsm(channel_fsm_); acquisition->set_channel(1); - acquisition->set_doppler_max(doppler_max); acquisition->set_doppler_step(doppler_step); acquisition->set_doppler_center(0); acquisition->set_threshold(0.001); diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc index 77a57303b..1d80c56ff 100644 --- a/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc +++ b/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc @@ -482,10 +482,6 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1C.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1C.doppler_step", 500)); }) << "Failure setting doppler_step."; @@ -570,10 +566,6 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResultsProbabilitie acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1C.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1C.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 e4f140b5b..8a7a3c98f 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 @@ -610,10 +610,6 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(10000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(250); }) << "Failure setting doppler_step."; @@ -703,10 +699,6 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsWithNoise acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(10000); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(250); }) << "Failure setting doppler_step."; 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 07825fae9..115560cef 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 @@ -479,10 +479,6 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResults) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1C.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1C.doppler_step", 500)); }) << "Failure setting doppler_step."; @@ -566,10 +562,6 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) acquisition->set_gnss_synchro(&gnss_synchro); }) << "Failure setting gnss_synchro."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(config->property("Acquisition_1C.doppler_max", 10000)); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(config->property("Acquisition_1C.doppler_step", 500)); }) << "Failure setting doppler_step."; 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 78bbeb715..4845d8792 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 @@ -332,10 +332,6 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) acquisition->set_threshold(0.001); }) << "Failure setting threshold."; - ASSERT_NO_THROW({ - acquisition->set_doppler_max(doppler_max); - }) << "Failure setting doppler_max."; - ASSERT_NO_THROW({ acquisition->set_doppler_step(doppler_step); }) << "Failure setting doppler_step."; 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 b28545e75..05a81b9c5 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 @@ -543,11 +543,9 @@ bool HybridObservablesTest::acquire_signal() acquisition->set_gnss_synchro(&tmp_gnss_synchro); acquisition->set_channel(0); #if USE_GLOG_AND_GFLAGS - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", FLAGS_external_signal_acquisition_doppler_max_hz)); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", FLAGS_external_signal_acquisition_doppler_step_hz)); acquisition->set_threshold(config->property("Acquisition.threshold", FLAGS_external_signal_acquisition_threshold)); #else - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_max_hz))); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_step_hz))); acquisition->set_threshold(config->property("Acquisition.threshold", absl::GetFlag(FLAGS_external_signal_acquisition_threshold))); #endif diff --git a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc index add79d187..1e0674903 100644 --- a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc +++ b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc @@ -700,12 +700,10 @@ bool HybridObservablesTestFpga::acquire_signal() acquisition->set_channel_fsm(channel_fsm_); acquisition->set_channel(0); #if USE_GLOG_AND_GFLAGS - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", FLAGS_external_signal_acquisition_doppler_max_hz)); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", FLAGS_external_signal_acquisition_doppler_step_hz)); acquisition->set_doppler_center(0); acquisition->set_threshold(config->property("Acquisition.threshold", FLAGS_external_signal_acquisition_threshold)); #else - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_max_hz))); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_step_hz))); acquisition->set_doppler_center(0); acquisition->set_threshold(config->property("Acquisition.threshold", absl::GetFlag(FLAGS_external_signal_acquisition_threshold))); 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 d46d0e802..02faeeab3 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 @@ -536,11 +536,9 @@ bool TrackingPullInTest::acquire_signal(int SV_ID) acquisition->set_gnss_synchro(&tmp_gnss_synchro); acquisition->set_channel(0); #if USE_GLOG_AND_GFLAGS - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", FLAGS_external_signal_acquisition_doppler_max_hz)); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", FLAGS_external_signal_acquisition_doppler_step_hz)); acquisition->set_threshold(config->property("Acquisition.threshold", FLAGS_external_signal_acquisition_threshold)); #else - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_max_hz))); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_step_hz))); acquisition->set_threshold(config->property("Acquisition.threshold", absl::GetFlag(FLAGS_external_signal_acquisition_threshold))); #endif diff --git a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index 8bc477c75..2a8ee8bff 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -696,12 +696,10 @@ bool TrackingPullInTestFpga::acquire_signal(int SV_ID) acquisition->set_channel_fsm(channel_fsm_); acquisition->set_channel(0); #if USE_GLOG_AND_GFLAGS - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", FLAGS_external_signal_acquisition_doppler_max_hz)); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", FLAGS_external_signal_acquisition_doppler_step_hz)); acquisition->set_doppler_center(0); acquisition->set_threshold(config->property("Acquisition.threshold", FLAGS_external_signal_acquisition_threshold)); #else - acquisition->set_doppler_max(config->property("Acquisition.doppler_max", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_max_hz))); acquisition->set_doppler_step(config->property("Acquisition.doppler_step", absl::GetFlag(FLAGS_external_signal_acquisition_doppler_step_hz))); acquisition->set_doppler_center(0); acquisition->set_threshold(config->property("Acquisition.threshold", absl::GetFlag(FLAGS_external_signal_acquisition_threshold))); diff --git a/utils/front-end-cal/main.cc b/utils/front-end-cal/main.cc index db0bd3888..e002b86f7 100644 --- a/utils/front-end-cal/main.cc +++ b/utils/front-end-cal/main.cc @@ -473,13 +473,13 @@ int main(int argc, char** argv) int64_t fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", 2048000); configuration->set_property("Acquisition.max_dwells", "10"); + configuration->set_property("Acquisition.doppler_max", "10000"); auto acquisition = std::make_shared(configuration.get(), "Acquisition", 1, 1); acquisition->set_channel(1); acquisition->set_gnss_synchro(&gnss_synchro); acquisition->set_threshold(configuration->property("Acquisition.threshold", 2.0)); - acquisition->set_doppler_max(configuration->property("Acquisition.doppler_max", 10000)); acquisition->set_doppler_step(configuration->property("Acquisition.doppler_step", 250)); gr::block_sptr source; From 7b2d3fd2687de3159c2e5b7421df0150ffc3338e Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Wed, 5 Nov 2025 16:27:17 +0000 Subject: [PATCH 2/4] Add const --- .../acquisition/gnuradio_blocks/pcps_acquisition_fpga.h | 2 +- .../acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 2 +- .../acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h | 2 +- .../acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h | 2 +- .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index b4d291271..09f4a558a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -189,7 +189,7 @@ private: uint32_t d_doppler_index; uint32_t d_channel; uint32_t d_doppler_step; - uint32_t d_doppler_max; + const uint32_t d_doppler_max; uint32_t d_num_doppler_bins; uint32_t d_total_block_exp; uint32_t d_num_doppler_bins_step2; 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 d7bd9c8e7..b8beec6ad 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -205,7 +205,7 @@ private: int32_t d_samples_per_ms; int32_t d_samples_per_code; uint32_t d_doppler_resolution; - uint32_t d_doppler_max; + const uint32_t d_doppler_max; uint32_t d_doppler_step; uint32_t d_sampled_ms; uint32_t d_max_dwells; 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 af65ebae2..c42d62b0e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -264,7 +264,7 @@ private: int d_opencl; uint32_t d_doppler_resolution; - uint32_t d_doppler_max; + const uint32_t d_doppler_max; uint32_t d_doppler_step; uint32_t d_sampled_ms; uint32_t d_max_dwells; 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 787042e3f..b460891ef 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -238,7 +238,7 @@ private: uint32_t d_channel; uint32_t d_folding_factor; // also referred in the paper as 'p' uint32_t d_doppler_resolution; - uint32_t d_doppler_max; + const uint32_t d_doppler_max; uint32_t d_doppler_step; uint32_t d_sampled_ms; uint32_t d_max_dwells; 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 0bf261ab1..175d10c2e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -218,7 +218,7 @@ private: int32_t d_samples_per_code; uint32_t d_channel; uint32_t d_doppler_resolution; - uint32_t d_doppler_max; + const uint32_t d_doppler_max; uint32_t d_doppler_step; uint32_t d_sampled_ms; uint32_t d_dwell_count; From 3a18fea729c3df12bbf8e8168375c814355902bc Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Wed, 5 Nov 2025 16:33:41 +0000 Subject: [PATCH 3/4] More const --- .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc | 3 ++- .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h | 2 +- .../acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 0efa83fa7..305a14bdb 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 @@ -643,7 +643,8 @@ void pcps_acquisition_fine_doppler_cc::dump_results(int effective_fft_size) dims[0] = static_cast(1); dims[1] = static_cast(1); - matvar = Mat_VarCreate("doppler_max", MAT_C_INT32, MAT_T_INT32, 1, dims.data(), &d_config_doppler_max, 0); + auto doppler_max = d_config_doppler_max; + matvar = Mat_VarCreate("doppler_max", MAT_C_INT32, MAT_T_INT32, 1, dims.data(), &doppler_max, 0); Mat_VarWrite(matfp, matvar, MAT_COMPRESSION_ZLIB); // or MAT_COMPRESSION_NONE Mat_VarFree(matvar); 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 0f6b8d3c5..43837a6d0 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 @@ -217,7 +217,7 @@ private: int d_state; int d_samples_per_ms; int d_max_dwells; - int d_config_doppler_max; + const int d_config_doppler_max; int d_num_doppler_points; int d_well_count; int d_n_samples_in_buffer; 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 d4386b1b4..0b1d9a3d5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -224,7 +224,7 @@ private: int32_t d_gnuradio_forecast_samples; int32_t d_doppler_max; int32_t d_doppler_min; - int32_t d_config_doppler_max; + const int32_t d_config_doppler_max; int32_t d_config_doppler_min; int32_t d_num_doppler_points; int32_t d_doppler_step; From 7c4b6903f26609929179ca1ed7ca8c33da0d6f45 Mon Sep 17 00:00:00 2001 From: Mathieu Favreau Date: Wed, 5 Nov 2025 16:44:50 +0000 Subject: [PATCH 4/4] More const --- .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 2 +- .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h | 2 +- .../acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc | 4 ++-- src/algorithms/acquisition/libs/fpga_acquisition.cc | 6 +++--- src/algorithms/acquisition/libs/fpga_acquisition.h | 5 +++-- 5 files changed, 10 insertions(+), 9 deletions(-) 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 1d881f7d7..9a0d9af68 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 @@ -234,7 +234,7 @@ private: int d_CAF_window_hz; int d_buffer_count; int d_doppler_resolution; - int d_doppler_max; + const int d_doppler_max; int d_doppler_step; int d_fft_size; int d_num_doppler_bins; 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 0791c39e3..95e33aedc 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 @@ -208,7 +208,7 @@ private: int32_t d_samples_per_code; uint32_t d_channel; uint32_t d_doppler_resolution; - uint32_t d_doppler_max; + const uint32_t d_doppler_max; uint32_t d_doppler_step; uint32_t d_sampled_ms; uint32_t d_max_dwells; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index d7b99b57a..daf471be7 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -62,7 +62,7 @@ pcps_acquisition_fpga::pcps_acquisition_fpga(Acq_Conf_Fpga *conf_, uint32_t acq_ d_make_2_steps(d_acq_parameters->make_2_steps) { d_acquisition_fpga = std::make_unique(d_acq_parameters->device_name, acq_buff_num, - downsampling_filter_specs, max_FFT_size); + d_doppler_max, downsampling_filter_specs, max_FFT_size); } void pcps_acquisition_fpga::set_local_code() @@ -72,7 +72,7 @@ void pcps_acquisition_fpga::set_local_code() void pcps_acquisition_fpga::init() { - d_acquisition_fpga->init(d_acq_parameters->code_length, d_doppler_max, d_acq_parameters->fft_size, + d_acquisition_fpga->init(d_acq_parameters->code_length, d_acq_parameters->fft_size, d_acq_parameters->resampled_fs, d_acq_parameters->downsampling_filter_num, d_acq_parameters->excludelimit, d_acq_parameters->all_fft_codes); d_gnss_synchro->Flag_valid_acquisition = false; d_gnss_synchro->Flag_valid_symbol_output = false; diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.cc b/src/algorithms/acquisition/libs/fpga_acquisition.cc index 87ac2478d..23517f170 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.cc +++ b/src/algorithms/acquisition/libs/fpga_acquisition.cc @@ -49,6 +49,7 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name, uint32_t select_queue, + uint32_t doppler_max, std::vector> &downsampling_filter_specs, uint32_t &max_FFT_size) : d_device_name(std::move(device_name)), d_resampled_fs(0), @@ -62,7 +63,7 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name, d_downsampling_factor(1), d_downsampling_filter_delay(0), d_select_queue(select_queue), - d_doppler_max(0), + d_doppler_max(doppler_max), d_doppler_step(0), d_PRN(0), d_IP_core_version(0) @@ -76,7 +77,7 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name, } -void Fpga_Acquisition::init(uint32_t nsamples, uint32_t doppler_max, uint32_t fft_size, +void Fpga_Acquisition::init(uint32_t nsamples uint32_t fft_size, int64_t resampled_fs, uint32_t downsampling_filter_num, uint32_t excludelimit, uint32_t *all_fft_codes) { d_resampled_fs = resampled_fs; @@ -90,7 +91,6 @@ void Fpga_Acquisition::init(uint32_t nsamples, uint32_t doppler_max, uint32_t ff d_downsampling_factor = d_downsampling_filter_specs[d_filter_num - 1].first; d_downsampling_filter_delay = d_downsampling_filter_specs[d_filter_num - 1].second; } - d_doppler_max = doppler_max; } diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.h b/src/algorithms/acquisition/libs/fpga_acquisition.h index 6f43084ab..97a56e71b 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.h +++ b/src/algorithms/acquisition/libs/fpga_acquisition.h @@ -45,6 +45,7 @@ public: Fpga_Acquisition( std::string device_name, uint32_t select_queue, + uint32_t doppler_max, std::vector> &downsampling_filter_specs, uint32_t &max_FFT_size); @@ -57,7 +58,7 @@ public: * \brief Initialize acquisition parameters */ // void init(uint32_t samples_per_code, uint32_t code_length, int64_t resampled_fs, uint32_t *all_fft_codes); - void init(uint32_t nsamples, uint32_t doppler_max, uint32_t d_fft_size, + void init(uint32_t nsamples, uint32_t d_fft_size, int64_t resampled_fs, uint32_t downsampling_filter_num, uint32_t excludelimit, uint32_t *all_fft_codes); /*! @@ -210,7 +211,7 @@ private: uint32_t d_downsampling_factor; // downsampling_factor uint32_t d_downsampling_filter_delay; // Impulse response delay of the downsampling filter uint32_t d_select_queue; // queue selection - uint32_t d_doppler_max; // max doppler + const uint32_t d_doppler_max; // max doppler uint32_t d_doppler_step; // doppler step uint32_t d_PRN; // PRN uint32_t d_IP_core_version; // FPGA acquisition IP core version