From 6ba8cea5f44d7d3e748b238ddfb7c17409cd7391 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Wed, 13 Apr 2016 16:45:17 +0200 Subject: [PATCH] removed unused queue from PCPS acquisition constructors --- .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc | 7 +++---- .../adapters/galileo_e1_pcps_ambiguous_acquisition.h | 4 +--- .../acquisition/adapters/gps_l1_ca_pcps_acquisition.cc | 9 ++++----- .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h | 2 +- .../acquisition/adapters/gps_l2_m_pcps_acquisition.cc | 7 +++---- .../acquisition/adapters/gps_l2_m_pcps_acquisition.h | 4 +--- .../acquisition/gnuradio_blocks/pcps_acquisition_cc.cc | 8 ++++---- .../acquisition/gnuradio_blocks/pcps_acquisition_cc.h | 8 +++----- .../acquisition/gnuradio_blocks/pcps_acquisition_sc.cc | 7 +++---- .../acquisition/gnuradio_blocks/pcps_acquisition_sc.h | 8 +++----- src/core/receiver/gnss_block_factory.cc | 10 +++++----- .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 8 ++++---- .../gnss_block/gps_l1_ca_pcps_acquisition_test.cc | 6 +++--- src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc | 6 +++--- 14 files changed, 41 insertions(+), 53 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 1da387806..c80d4f46e 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -41,9 +41,8 @@ using google::LogMessage; GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams, - boost::shared_ptr queue) : - role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue) + unsigned int in_streams, unsigned int out_streams) : + role_(role), in_streams_(in_streams), out_streams_(out_streams) { configuration_ = configuration; std::string default_item_type = "gr_complex"; @@ -98,7 +97,7 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_make_acquisition_cc(sampled_ms_, max_dwells_, shift_resolution_, if_, fs_in_, samples_per_ms, code_length_, - bit_transition_flag_, use_CFAR_algorithm_flag_, queue_, dump_, dump_filename_); + bit_transition_flag_, use_CFAR_algorithm_flag_, dump_, dump_filename_); stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); DLOG(INFO) << "stream_to_vector(" << stream_to_vector_->unique_id() << ")"; DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id() << ")"; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index efd53e03e..066d44f26 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -33,7 +33,6 @@ #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -51,7 +50,7 @@ class GalileoE1PcpsAmbiguousAcquisition: public AcquisitionInterface public: GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GalileoE1PcpsAmbiguousAcquisition(); @@ -160,7 +159,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; concurrent_queue *channel_internal_queue_; float calculate_threshold(float pfa); }; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index 385f3d668..e1d6ba8f0 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -45,9 +45,8 @@ using google::LogMessage; GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams, - gr::msg_queue::sptr queue) : - role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue) + unsigned int in_streams, unsigned int out_streams) : + role_(role), in_streams_(in_streams), out_streams_(out_streams) { configuration_ = configuration; std::string default_item_type = "gr_complex"; @@ -90,14 +89,14 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( item_size_ = sizeof(lv_16sc_t); acquisition_sc_ = pcps_make_acquisition_sc(sampled_ms_, max_dwells_, shift_resolution_, if_, fs_in_, code_length_, code_length_, - bit_transition_flag_, use_CFAR_algorithm_flag_, queue_, dump_, dump_filename_); + bit_transition_flag_, use_CFAR_algorithm_flag_, dump_, dump_filename_); DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id() << ")"; }else{ item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_make_acquisition_cc(sampled_ms_, max_dwells_, shift_resolution_, if_, fs_in_, code_length_, code_length_, - bit_transition_flag_, use_CFAR_algorithm_flag_, queue_, dump_, dump_filename_); + bit_transition_flag_, use_CFAR_algorithm_flag_, dump_, dump_filename_); DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id() << ")"; } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index a14ff1635..35946bbe9 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -61,7 +61,7 @@ class GpsL1CaPcpsAcquisition: public AcquisitionInterface public: GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsAcquisition(); diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index b8de283ae..061e54a45 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -43,9 +43,8 @@ using google::LogMessage; GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams, - gr::msg_queue::sptr queue) : - role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue) + unsigned int in_streams, unsigned int out_streams) : + role_(role), in_streams_(in_streams), out_streams_(out_streams) { configuration_ = configuration; std::string default_item_type = "gr_complex"; @@ -88,7 +87,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_make_acquisition_cc(1, max_dwells_, shift_resolution_, if_, fs_in_, code_length_, code_length_, - bit_transition_flag_, use_CFAR_algorithm_flag_, queue_, dump_, dump_filename_); + bit_transition_flag_, use_CFAR_algorithm_flag_, dump_, dump_filename_); stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index 939d7d7e8..1b441e9a8 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -35,7 +35,6 @@ #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_ #include -#include #include #include #include "gnss_synchro.h" @@ -57,7 +56,7 @@ class GpsL2MPcpsAcquisition: public AcquisitionInterface public: GpsL2MPcpsAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL2MPcpsAcquisition(); @@ -168,7 +167,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; concurrent_queue *channel_internal_queue_; float calculate_threshold(float pfa); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc index 399229073..971517312 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc @@ -50,13 +50,13 @@ pcps_acquisition_cc_sptr pcps_make_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) { return pcps_acquisition_cc_sptr( new pcps_acquisition_cc(sampled_ms, max_dwells, doppler_max, freq, fs_in, samples_per_ms, - samples_per_code, bit_transition_flag, use_CFAR_algorithm_flag, queue, dump, dump_filename)); + samples_per_code, bit_transition_flag, use_CFAR_algorithm_flag, dump, dump_filename)); } pcps_acquisition_cc::pcps_acquisition_cc( @@ -64,7 +64,7 @@ pcps_acquisition_cc::pcps_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) : gr::block("pcps_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms * ( bit_transition_flag ? 2 : 1 )), @@ -73,7 +73,7 @@ pcps_acquisition_cc::pcps_acquisition_cc( d_sample_counter = 0; // SAMPLE COUNTER d_active = false; d_state = 0; - d_queue = queue; + //d_queue = queue; d_freq = freq; d_fs_in = fs_in; d_samples_per_ms = samples_per_ms; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h index 8a91f1f6c..b7b4577d6 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include "concurrent_queue.h" @@ -68,7 +67,7 @@ pcps_make_acquisition_cc(unsigned int sampled_ms, unsigned int max_dwells, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); /*! @@ -85,14 +84,14 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); pcps_acquisition_cc(unsigned int sampled_ms, unsigned int max_dwells, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); void update_local_carrier(gr_complex* carrier_vector, int correlator_length_samples, float freq); @@ -125,7 +124,6 @@ private: float d_test_statistics; bool d_bit_transition_flag; bool d_use_CFAR_algorithm_flag; - gr::msg_queue::sptr d_queue; concurrent_queue *d_channel_internal_queue; std::ofstream d_dump_file; bool d_active; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc index 1b6bc9ed2..fe01f2425 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc @@ -49,13 +49,13 @@ pcps_acquisition_sc_sptr pcps_make_acquisition_sc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) { return pcps_acquisition_sc_sptr( new pcps_acquisition_sc(sampled_ms, max_dwells, doppler_max, freq, fs_in, samples_per_ms, - samples_per_code, bit_transition_flag, use_CFAR_algorithm_flag, queue, dump, dump_filename)); + samples_per_code, bit_transition_flag, use_CFAR_algorithm_flag, dump, dump_filename)); } pcps_acquisition_sc::pcps_acquisition_sc( @@ -63,7 +63,7 @@ pcps_acquisition_sc::pcps_acquisition_sc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) : gr::block("pcps_acquisition_sc", gr::io_signature::make(1, 1, sizeof(lv_16sc_t) * sampled_ms * samples_per_ms * ( bit_transition_flag ? 2 : 1 )), @@ -72,7 +72,6 @@ pcps_acquisition_sc::pcps_acquisition_sc( d_sample_counter = 0; // SAMPLE COUNTER d_active = false; d_state = 0; - d_queue = queue; d_freq = freq; d_fs_in = fs_in; d_samples_per_ms = samples_per_ms; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h index 89efcb460..81bd1ab55 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include "concurrent_queue.h" @@ -68,7 +67,7 @@ pcps_make_acquisition_sc(unsigned int sampled_ms, unsigned int max_dwells, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); /*! @@ -85,14 +84,14 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); pcps_acquisition_sc(unsigned int sampled_ms, unsigned int max_dwells, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, bool use_CFAR_algorithm_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); void update_local_carrier(gr_complex* carrier_vector, @@ -129,7 +128,6 @@ private: float d_test_statistics; bool d_bit_transition_flag; bool d_use_CFAR_algorithm_flag; - gr::msg_queue::sptr d_queue; concurrent_queue *d_channel_internal_queue; std::ofstream d_dump_file; bool d_active; diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index ac3e74201..dfb89e131 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -1213,7 +1213,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_Assisted_Acquisition") == 0) @@ -1259,7 +1259,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1PcpsAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_8ms_Ambiguous_Acquisition") == 0) @@ -1435,7 +1435,7 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( if (implementation.compare("GPS_L1_CA_PCPS_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_Assisted_Acquisition") == 0) @@ -1481,13 +1481,13 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( else if (implementation.compare("GPS_L2_M_PCPS_Acquisition") == 0) { std::unique_ptr block_(new GpsL2MPcpsAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1PcpsAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_8ms_Ambiguous_Acquisition") == 0) diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index 475c35945..c4012b8ed 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -361,7 +361,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test::stop_queue() TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, Instantiate) { config_1(); - acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1, queue); + acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1); delete acquisition; } @@ -375,7 +375,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); config_1(); - acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1, queue); + acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -404,7 +404,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults) queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Acquisition test"); - acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1, queue); + acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->set_channel(1); @@ -501,7 +501,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) config_2(); queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Acquisition test"); - acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1, queue); + acquisition = new GpsL1CaPcpsAcquisition(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->set_channel(1); diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc index f22c8fcf0..de86b2875 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc @@ -136,7 +136,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate) { init(); queue = gr::msg_queue::make(0); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun) @@ -150,7 +150,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun) queue = gr::msg_queue::make(0); init(); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -183,7 +183,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults) double expected_doppler_hz = 1680; init(); start_queue(); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { diff --git a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc index d56b60a7a..11a54402f 100644 --- a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc @@ -148,7 +148,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, Instantiate) { init(); queue = gr::msg_queue::make(0); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun) @@ -160,7 +160,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun) queue = gr::msg_queue::make(0); init(); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -194,7 +194,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) double expected_doppler_hz = 1200;//3000; init(); start_queue(); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( {