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 b5499227d..d6859919c 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 @@ -41,9 +41,8 @@ using google::LogMessage; GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( 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"; @@ -91,7 +90,7 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = galileo_pcps_8ms_make_acquisition_cc(sampled_ms_, max_dwells_, doppler_max_, if_, fs_in_, samples_per_ms, code_length_, - queue_, dump_, dump_filename_); + 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() << ")"; 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 bdaaac077..75c25b0a7 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 @@ -33,7 +33,6 @@ #define GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -51,7 +50,7 @@ class GalileoE1Pcps8msAmbiguousAcquisition: public AcquisitionInterface public: GalileoE1Pcps8msAmbiguousAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GalileoE1Pcps8msAmbiguousAcquisition(); @@ -147,7 +146,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 95c678eb1..690e3879d 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 @@ -41,9 +41,8 @@ using google::LogMessage; GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition( 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"; @@ -91,7 +90,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_cccwsr_make_acquisition_cc(sampled_ms_, max_dwells_, doppler_max_, if_, fs_in_, samples_per_ms, code_length_, - queue_, dump_, dump_filename_); + 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() << ")"; 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 e1aba2c65..228b4a527 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 @@ -33,7 +33,6 @@ #define GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -51,7 +50,7 @@ class GalileoE1PcpsCccwsrAmbiguousAcquisition: public AcquisitionInterface public: GalileoE1PcpsCccwsrAmbiguousAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GalileoE1PcpsCccwsrAmbiguousAcquisition(); @@ -151,7 +150,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 d5d1296a4..e6be855d2 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 @@ -41,9 +41,8 @@ using google::LogMessage; GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcquisition( 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"; @@ -124,7 +123,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_quicksync_make_acquisition_cc(folding_factor_, sampled_ms_, max_dwells_, doppler_max_, if_, fs_in_, - samples_per_ms, code_length_, bit_transition_flag_, queue_, + samples_per_ms, code_length_, bit_transition_flag_, dump_, dump_filename_); stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); 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 5a6876b18..847419692 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 @@ -33,7 +33,6 @@ #define GNSS_SDR_GALILEO_E1_PCPS_QUICKSYNC_AMBIGUOUS_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -51,7 +50,7 @@ class GalileoE1PcpsQuickSyncAmbiguousAcquisition: public AcquisitionInterface public: GalileoE1PcpsQuickSyncAmbiguousAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GalileoE1PcpsQuickSyncAmbiguousAcquisition(); @@ -154,7 +153,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 b191d1700..042ba27e9 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 @@ -41,9 +41,8 @@ using google::LogMessage; GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( 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"; @@ -93,7 +92,7 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_tong_make_acquisition_cc(sampled_ms_, doppler_max_, if_, fs_in_, samples_per_ms, code_length_, tong_init_val_, - tong_max_val_, queue_, dump_, dump_filename_); + tong_max_val_, dump_, dump_filename_); stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); DLOG(INFO) << "stream_to_vector(" 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 c89d31137..821bab60e 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 @@ -33,7 +33,6 @@ #define GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -51,7 +50,7 @@ class GalileoE1PcpsTongAmbiguousAcquisition: public AcquisitionInterface public: GalileoE1PcpsTongAmbiguousAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GalileoE1PcpsTongAmbiguousAcquisition(); @@ -153,7 +152,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 785c93d5d..e7701a513 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 @@ -4,7 +4,7 @@ * Galileo E5a data and pilot Signals * \author Marc Sales, 2014. marcsales92(at)gmail.com * \based on work from: - *
    + *
      *
    • Javier Arribas, 2011. jarribas(at)cttc.es *
    • Luis Esteve, 2012. luis(at)epsilon-formacion.com *
    • Marc Molina, 2013. marc.molina.pena@gmail.com @@ -47,9 +47,8 @@ using google::LogMessage; GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( 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"; @@ -101,7 +100,7 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( { item_size_ = sizeof(gr_complex); acquisition_cc_ = galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(sampled_ms_, max_dwells_, - doppler_max_, if_, fs_in_, code_length_, code_length_, bit_transition_flag_, queue_, + doppler_max_, if_, fs_in_, code_length_, code_length_, bit_transition_flag_, dump_, dump_filename_, both_signal_components, CAF_window_hz_,Zero_padding); } else 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 033e57569..e2a867c63 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 @@ -39,7 +39,6 @@ #define GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -52,7 +51,7 @@ class GalileoE5aNoncoherentIQAcquisitionCaf: public AcquisitionInterface public: GalileoE5aNoncoherentIQAcquisitionCaf(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GalileoE5aNoncoherentIQAcquisitionCaf(); @@ -161,7 +160,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; #endif /* GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H_ */ 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 8218669c4..cb82e6837 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -37,7 +37,6 @@ #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_ #include -#include #include #include #include "gnss_synchro.h" @@ -168,7 +167,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 e7d46b0da..254e71369 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 @@ -42,9 +42,8 @@ using google::LogMessage; GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler( 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) { std::string default_item_type = "gr_complex"; std::string default_dump_filename = "./data/acquisition.dat"; @@ -61,7 +60,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler( sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1); max_dwells_= configuration->property(role + ".max_dwells", 1); - //--- Find number of samples per spreading code ------------------------- vector_length_ = round(fs_in_ / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)); @@ -72,7 +70,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler( { item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_make_acquisition_fine_doppler_cc(max_dwells_,sampled_ms_, - doppler_max_, doppler_min_, if_, fs_in_, vector_length_, queue_, + doppler_max_, doppler_min_, if_, fs_in_, vector_length_, dump_, dump_filename_); } else 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 0424622f3..0b6796a8b 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 @@ -35,7 +35,6 @@ #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H_ #include -#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_acquisition_fine_doppler_cc.h" @@ -53,7 +52,7 @@ class GpsL1CaPcpsAcquisitionFineDoppler: public AcquisitionInterface public: GpsL1CaPcpsAcquisitionFineDoppler(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsAcquisitionFineDoppler(); @@ -144,7 +143,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; }; #endif /* GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H_ */ 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 2f2e51498..beb45c323 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 @@ -42,12 +42,9 @@ using google::LogMessage; GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition( 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) { - std::string default_item_type = "gr_complex"; std::string default_dump_filename = "./data/acquisition.dat"; @@ -72,8 +69,8 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition( if (item_type_.compare("gr_complex") == 0) { item_size_ = sizeof(gr_complex); - acquisition_cc_ = pcps_make_assisted_acquisition_cc(max_dwells_,sampled_ms_, - doppler_max_, doppler_min_, if_, fs_in_, vector_length_, queue_, + acquisition_cc_ = pcps_make_assisted_acquisition_cc(max_dwells_, sampled_ms_, + doppler_max_, doppler_min_, if_, fs_in_, vector_length_, dump_, dump_filename_); } 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 c877126e4..d2faf3f51 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 @@ -35,7 +35,6 @@ #define GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H_ #include -#include #include "gnss_synchro.h" #include "acquisition_interface.h" #include "pcps_assisted_acquisition_cc.h" @@ -53,7 +52,7 @@ class GpsL1CaPcpsAssistedAcquisition: public AcquisitionInterface public: GpsL1CaPcpsAssistedAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsAssistedAcquisition(); @@ -145,7 +144,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; }; #endif /* GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H_ */ diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc index 37aaa388b..9bd8f8b3e 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc @@ -41,9 +41,8 @@ using google::LogMessage; GpsL1CaPcpsMultithreadAcquisition::GpsL1CaPcpsMultithreadAcquisition( 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"; @@ -87,7 +86,7 @@ GpsL1CaPcpsMultithreadAcquisition::GpsL1CaPcpsMultithreadAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_make_multithread_acquisition_cc(sampled_ms_, max_dwells_, doppler_max_, if_, fs_in_, code_length_, code_length_, - bit_transition_flag_, queue_, dump_, dump_filename_); + bit_transition_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_l1_ca_pcps_multithread_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h index 15e439eaf..8b1f1af0a 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_L1_CA_PCPS_MULTITHREAD_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -52,7 +51,7 @@ class GpsL1CaPcpsMultithreadAcquisition: public AcquisitionInterface public: GpsL1CaPcpsMultithreadAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsMultithreadAcquisition(); @@ -149,7 +148,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 f5a80081b..ba2c6b68c 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 @@ -40,9 +40,8 @@ using google::LogMessage; GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition( 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"; @@ -86,7 +85,7 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_make_opencl_acquisition_cc(sampled_ms_, max_dwells_, doppler_max_, if_, fs_in_, code_length_, code_length_, - bit_transition_flag_, queue_, dump_, dump_filename_); + bit_transition_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_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index 435cf6bb7..9eea40659 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 @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -52,7 +51,7 @@ class GpsL1CaPcpsOpenClAcquisition: public AcquisitionInterface public: GpsL1CaPcpsOpenClAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsOpenClAcquisition(); @@ -149,7 +148,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; 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 1d6471cf2..f732b5aba 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 @@ -43,9 +43,8 @@ using google::LogMessage; GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition( 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"; @@ -117,7 +116,7 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_quicksync_make_acquisition_cc(folding_factor_, sampled_ms_, max_dwells_,doppler_max_, if_, fs_in_, - samples_per_ms, code_length_,bit_transition_flag_, queue_, + samples_per_ms, code_length_,bit_transition_flag_, dump_, dump_filename_); stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, 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 40eb96a74..2e32df150 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 @@ -34,7 +34,6 @@ #define GNSS_SDR_GPS_L1_CA_PCPS_QUICKSYNC_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -54,7 +53,7 @@ class GpsL1CaPcpsQuickSyncAcquisition: public AcquisitionInterface public: GpsL1CaPcpsQuickSyncAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsQuickSyncAcquisition(); @@ -156,7 +155,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); 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 64e3566db..3490c0cec 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 @@ -41,9 +41,8 @@ using google::LogMessage; GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition( 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"; @@ -77,7 +76,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition( item_size_ = sizeof(gr_complex); acquisition_cc_ = pcps_tong_make_acquisition_cc(sampled_ms_, doppler_max_, if_, fs_in_, code_length_, code_length_, tong_init_val_, tong_max_val_, - queue_, dump_, dump_filename_); + dump_, dump_filename_); stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_); 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 2e523af34..deec6d712 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 @@ -33,7 +33,6 @@ #define GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H_ #include -#include #include #include "gnss_synchro.h" #include "acquisition_interface.h" @@ -51,7 +50,7 @@ class GpsL1CaPcpsTongAcquisition: public AcquisitionInterface public: GpsL1CaPcpsTongAcquisition(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue); + unsigned int out_streams); virtual ~GpsL1CaPcpsTongAcquisition(); @@ -153,7 +152,6 @@ private: std::string role_; unsigned int in_streams_; unsigned int out_streams_; - boost::shared_ptr queue_; float calculate_threshold(float pfa); }; diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index 2b5f9cca5..2fc4813dd 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -51,7 +51,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, @@ -60,7 +60,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make return galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr( new galileo_e5a_noncoherentIQ_acquisition_caf_cc(sampled_ms, max_dwells, doppler_max, freq, fs_in, samples_per_ms, - samples_per_code, bit_transition_flag, queue, dump, dump_filename, both_signal_components_, CAF_window_hz_, Zero_padding_)); + samples_per_code, bit_transition_flag, dump, dump_filename, both_signal_components_, CAF_window_hz_, Zero_padding_)); } galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisition_caf_cc( @@ -69,7 +69,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, @@ -82,7 +82,6 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit 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; @@ -359,7 +358,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items * 4. OPTIONAL: CAF filter to avoid doppler ambiguity * 5. Record the maximum peak and the associated synchronization parameters * 6. Compute the test statistics and compare to the threshold - * 7. Declare positive or negative acquisition using a message queue + * 7. Declare positive or negative acquisition using a message port */ int acquisition_message = -1; //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL @@ -768,7 +767,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items } case 3: { - // 7.1- Declare positive acquisition using a message queue + // 7.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -790,7 +789,7 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items } case 4: { - // 7.2- Declare negative acquisition using a message queue + // 7.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 83378da62..d4d3b31d4 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 @@ -41,10 +41,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class galileo_e5a_noncoherentIQ_acquisition_caf_cc; @@ -57,7 +55,7 @@ galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(unsigned int sampled_ms, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, @@ -79,7 +77,7 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, @@ -91,7 +89,7 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename, bool both_signal_components_, int CAF_window_hz_, @@ -135,7 +133,6 @@ private: float d_input_power; float d_test_statistics; bool d_bit_transition_flag; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index 307f39c10..5f26d1974 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -43,21 +43,19 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename) + bool dump, std::string dump_filename) { return galileo_pcps_8ms_acquisition_cc_sptr( new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, freq, fs_in, samples_per_ms, - samples_per_code, queue, dump, dump_filename)); + samples_per_code, dump, dump_filename)); } galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename) : + bool dump, std::string dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) @@ -66,7 +64,6 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc( 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; @@ -373,7 +370,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items, case 2: { - // 6.1- Declare positive acquisition using a message queue + // 6.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -398,7 +395,7 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items, case 3: { - // 6.2- Declare negative acquisition using a message queue + // 6.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 6ff13a954..332b91083 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 @@ -35,10 +35,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class galileo_pcps_8ms_acquisition_cc; @@ -49,8 +47,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename); + bool dump, std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition for @@ -63,15 +60,13 @@ private: galileo_pcps_8ms_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename); + bool dump, std::string dump_filename); galileo_pcps_8ms_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename); + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, int doppler_offset); @@ -103,7 +98,6 @@ private: float* d_magnitude; float d_input_power; float d_test_statistics; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc index 65c8862f7..d8fbe79a4 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc @@ -245,7 +245,7 @@ int pcps_acquisition_cc::general_work(int noutput_items, * 3. Perform the FFT-based circular convolution (parallel time search) * 4. Record the maximum peak and the associated synchronization parameters * 5. Compute the test statistics and compare to the threshold - * 6. Declare positive or negative acquisition using a message queue + * 6. Declare positive or negative acquisition using a message port */ int acquisition_message = -1; //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL @@ -432,7 +432,7 @@ int pcps_acquisition_cc::general_work(int noutput_items, case 2: { - // 6.1- Declare positive acquisition using a message queue + // 6.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -456,7 +456,7 @@ int pcps_acquisition_cc::general_work(int noutput_items, case 3: { - // 6.2- Declare negative acquisition using a message queue + // 6.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 74ad064c0..36f967d07 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 @@ -46,20 +46,20 @@ using google::LogMessage; pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc( int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, - long fs_in, int samples_per_ms, boost::shared_ptr queue, bool dump, + long fs_in, int samples_per_ms, bool dump, std::string dump_filename) { return pcps_acquisition_fine_doppler_cc_sptr( new pcps_acquisition_fine_doppler_cc(max_dwells, sampled_ms, doppler_max, doppler_min, freq, - fs_in, samples_per_ms, queue, dump, dump_filename)); + fs_in, samples_per_ms, dump, dump_filename)); } pcps_acquisition_fine_doppler_cc::pcps_acquisition_fine_doppler_cc( int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, - long fs_in, int samples_per_ms, boost::shared_ptr queue, bool dump, + long fs_in, int samples_per_ms, bool dump, std::string dump_filename) : gr::block("pcps_acquisition_fine_doppler_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), @@ -68,7 +68,6 @@ pcps_acquisition_fine_doppler_cc::pcps_acquisition_fine_doppler_cc( this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0; // SAMPLE COUNTER d_active = false; - d_queue = queue; d_freq = freq; d_fs_in = fs_in; d_samples_per_ms = samples_per_ms; @@ -431,7 +430,7 @@ int pcps_acquisition_fine_doppler_cc::estimate_Doppler(gr_vector_const_void_star int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items, - gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, + gr_vector_int &ninput_items __attribute__((unused)), gr_vector_const_void_star &input_items, gr_vector_void_star &output_items __attribute__((unused))) { @@ -502,7 +501,7 @@ int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items, DLOG(INFO) << "input signal power " << d_input_power; d_active = false; - // Send message to channel queue //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL + // Send message to channel port //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL this->message_port_pub(pmt::mp("events"), pmt::from_long(1)); d_state = 0; break; @@ -518,7 +517,7 @@ int pcps_acquisition_fine_doppler_cc::general_work(int noutput_items, DLOG(INFO) << "input signal power " << d_input_power; d_active = false; - // Send message to channel queue //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL + // Send message to channel port //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL this->message_port_pub(pmt::mp("events"), pmt::from_long(2)); d_state = 0; break; 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 89eff18b6..f5dbe6061 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 @@ -9,7 +9,7 @@ *
    • Perform the FFT-based circular convolution (parallel time search) *
    • Record the maximum peak and the associated synchronization parameters *
    • Compute the test statistics and compare to the threshold - *
    • Declare positive or negative acquisition using a message queue + *
    • Declare positive or negative acquisition using a message port * * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, @@ -51,10 +51,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class pcps_acquisition_fine_doppler_cc; @@ -65,7 +63,7 @@ pcps_acquisition_fine_doppler_cc_sptr; pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc(int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, long fs_in, int samples_per_ms, - boost::shared_ptr queue, bool dump, std::string dump_filename); + bool dump, std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition. @@ -80,12 +78,12 @@ private: friend pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc(int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, long fs_in, - int samples_per_ms, boost::shared_ptr queue, bool dump, + int samples_per_ms, bool dump, std::string dump_filename); pcps_acquisition_fine_doppler_cc(int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, long fs_in, - int samples_per_ms, boost::shared_ptr queue, bool dump, + int samples_per_ms, bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, @@ -129,7 +127,6 @@ private: float d_doppler_freq; float d_input_power; float d_test_statistics; - boost::shared_ptr d_queue; std::ofstream d_dump_file; int d_state; 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 50a0c9364..9f2a3ac7b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc @@ -246,7 +246,7 @@ int pcps_acquisition_sc::general_work(int noutput_items, * 3. Perform the FFT-based circular convolution (parallel time search) * 4. Record the maximum peak and the associated synchronization parameters * 5. Compute the test statistics and compare to the threshold - * 6. Declare positive or negative acquisition using a message queue + * 6. Declare positive or negative acquisition using a message port */ int acquisition_message = -1; //0=STOP_CHANNEL 1=ACQ_SUCCEES 2=ACQ_FAIL @@ -436,7 +436,7 @@ int pcps_acquisition_sc::general_work(int noutput_items, case 2: { - // 6.1- Declare positive acquisition using a message queue + // 6.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -461,7 +461,7 @@ int pcps_acquisition_sc::general_work(int noutput_items, case 3: { - // 6.2- Declare negative acquisition using a message queue + // 6.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h index 24bac67f6..bc13941f3 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.h @@ -9,7 +9,7 @@ *
    • Perform the FFT-based circular convolution (parallel time search) *
    • Record the maximum peak and the associated synchronization parameters *
    • Compute the test statistics and compare to the threshold - *
    • Declare positive or negative acquisition using a message queue + *
    • Declare positive or negative acquisition using a message port * * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, @@ -55,7 +55,6 @@ #include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class pcps_acquisition_sc; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc index 16aa30934..b50d3a8b4 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc @@ -47,19 +47,19 @@ using google::LogMessage; pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc( int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, - long fs_in, int samples_per_ms, boost::shared_ptr queue, bool dump, + long fs_in, int samples_per_ms, bool dump, std::string dump_filename) { return pcps_assisted_acquisition_cc_sptr( new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min, freq, - fs_in, samples_per_ms, queue, dump, dump_filename)); + fs_in, samples_per_ms, dump, dump_filename)); } pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc( int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, - long fs_in, int samples_per_ms, boost::shared_ptr queue, bool dump, + long fs_in, int samples_per_ms, bool dump, std::string dump_filename) : gr::block("pcps_assisted_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), @@ -68,7 +68,6 @@ pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc( this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0; // SAMPLE COUNTER d_active = false; - d_queue = queue; d_freq = freq; d_fs_in = fs_in; d_samples_per_ms = samples_per_ms; @@ -461,7 +460,7 @@ int pcps_assisted_acquisition_cc::general_work(int noutput_items, DLOG(INFO) << "doppler " << d_gnss_synchro->Acq_doppler_hz; DLOG(INFO) << "input signal power " << d_input_power; d_active = false; - // Send message to channel queue //0=STOP_CHANNEL 1=ACQ_SUCCESS 2=ACQ_FAIL + // Send message to channel port //0=STOP_CHANNEL 1=ACQ_SUCCESS 2=ACQ_FAIL this->message_port_pub(pmt::mp("events"), pmt::from_long(1)); free_grid_memory(); // consume samples to not block the GNU Radio flowgraph @@ -479,7 +478,7 @@ int pcps_assisted_acquisition_cc::general_work(int noutput_items, DLOG(INFO) << "doppler " << d_gnss_synchro->Acq_doppler_hz; DLOG(INFO) << "input signal power " << d_input_power; d_active = false; - // Send message to channel queue //0=STOP_CHANNEL 1=ACQ_SUCCESS 2=ACQ_FAIL + // Send message to channel port //0=STOP_CHANNEL 1=ACQ_SUCCESS 2=ACQ_FAIL this->message_port_pub(pmt::mp("events"), pmt::from_long(2)); free_grid_memory(); // consume samples to not block the GNU Radio flowgraph 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 ff29b0396..d090c04e6 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -51,10 +51,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class pcps_assisted_acquisition_cc; @@ -65,7 +63,7 @@ pcps_assisted_acquisition_cc_sptr; pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, long fs_in, int samples_per_ms, - boost::shared_ptr queue, bool dump, std::string dump_filename); + bool dump, std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition. @@ -79,12 +77,12 @@ private: friend pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, long fs_in, - int samples_per_ms, boost::shared_ptr queue, bool dump, + int samples_per_ms, bool dump, std::string dump_filename); pcps_assisted_acquisition_cc(int max_dwells, unsigned int sampled_ms, int doppler_max, int doppler_min, long freq, long fs_in, - int samples_per_ms, boost::shared_ptr queue, bool dump, + int samples_per_ms, bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, @@ -129,7 +127,6 @@ private: float d_doppler_freq; float d_input_power; float d_test_statistics; - boost::shared_ptr d_queue; std::ofstream d_dump_file; int d_state; bool d_active; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index 9ba128c68..e3e1b69de 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -50,22 +50,18 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename) - + bool dump, std::string dump_filename) { - return pcps_cccwsr_acquisition_cc_sptr( new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, freq, fs_in, - samples_per_ms, samples_per_code, queue, dump, dump_filename)); + samples_per_ms, samples_per_code, dump, dump_filename)); } pcps_cccwsr_acquisition_cc::pcps_cccwsr_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename) : + bool dump, std::string dump_filename) : gr::block("pcps_cccwsr_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms)) @@ -74,7 +70,6 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc( 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; @@ -381,7 +376,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, //d_test_statistics = 2 * d_fft_size * d_mag / d_input_power; d_test_statistics = d_mag / d_input_power; - // 6- Declare positive or negative acquisition using a message queue + // 6- Declare positive or negative acquisition using a message port if (d_test_statistics > d_threshold) { d_state = 2; // Positive acquisition @@ -398,7 +393,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, case 2: { - // 6.1- Declare positive acquisition using a message queue + // 6.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -423,7 +418,7 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items, case 3: { - // 6.2- Declare negative acquisition using a message queue + // 6.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 985838fb6..cc34f1abd 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -40,10 +40,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" @@ -55,8 +53,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename); + bool dump, std::string dump_filename); /*! * \brief This class implements a Parallel Code Phase Search Acquisition with @@ -69,15 +66,12 @@ private: pcps_cccwsr_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename); - + bool dump, std::string dump_filename); pcps_cccwsr_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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename); + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, int doppler_offset); @@ -113,7 +107,6 @@ private: gr_complex* d_correlation_minus; float d_input_power; float d_test_statistics; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc index 3912c39aa..851c2d566 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc @@ -50,13 +50,13 @@ pcps_multithread_acquisition_cc_sptr pcps_make_multithread_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) { return pcps_multithread_acquisition_cc_sptr( new pcps_multithread_acquisition_cc(sampled_ms, max_dwells, doppler_max, freq, fs_in, samples_per_ms, - samples_per_code, bit_transition_flag, queue, dump, dump_filename)); + samples_per_code, bit_transition_flag, dump, dump_filename)); } pcps_multithread_acquisition_cc::pcps_multithread_acquisition_cc( @@ -64,7 +64,7 @@ pcps_multithread_acquisition_cc::pcps_multithread_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) : gr::block("pcps_multithread_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), @@ -75,7 +75,6 @@ pcps_multithread_acquisition_cc::pcps_multithread_acquisition_cc( d_active = false; d_state = 0; d_core_working = false; - d_queue = queue; d_freq = freq; d_fs_in = fs_in; d_samples_per_ms = samples_per_ms; @@ -427,7 +426,7 @@ int pcps_multithread_acquisition_cc::general_work(int noutput_items, case 2: { - // Declare positive acquisition using a message queue + // Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -451,7 +450,7 @@ int pcps_multithread_acquisition_cc::general_work(int noutput_items, case 3: { - // Declare negative acquisition using a message queue + // Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h index 2b12cfb6d..30c10d190 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.h @@ -9,7 +9,7 @@ *
    • Perform the FFT-based circular convolution (parallel time search) *
    • Record the maximum peak and the associated synchronization parameters *
    • Compute the test statistics and compare to the threshold - *
    • Declare positive or negative acquisition using a message queue + *
    • Declare positive or negative acquisition using a message port * * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, @@ -55,10 +55,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class pcps_multithread_acquisition_cc; @@ -70,7 +68,7 @@ pcps_make_multithread_acquisition_cc(unsigned int sampled_ms, unsigned int max_d unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); /*! @@ -87,7 +85,7 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); @@ -95,7 +93,7 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, @@ -129,7 +127,6 @@ private: float d_input_power; float d_test_statistics; bool d_bit_transition_flag; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 63f163268..3c51ed60f 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -10,7 +10,7 @@ *
    • Perform the FFT-based circular convolution (parallel time search) *
    • Record the maximum peak and the associated synchronization parameters *
    • Compute the test statistics and compare to the threshold - *
    • Declare positive or negative acquisition using a message queue + *
    • Declare positive or negative acquisition using a message port * * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, @@ -70,13 +70,13 @@ pcps_opencl_acquisition_cc_sptr pcps_make_opencl_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) { return pcps_opencl_acquisition_cc_sptr( new pcps_opencl_acquisition_cc(sampled_ms, max_dwells, doppler_max, freq, fs_in, samples_per_ms, - samples_per_code, bit_transition_flag, queue, dump, dump_filename)); + samples_per_code, bit_transition_flag, dump, dump_filename)); } pcps_opencl_acquisition_cc::pcps_opencl_acquisition_cc( @@ -84,7 +84,7 @@ pcps_opencl_acquisition_cc::pcps_opencl_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) : gr::block("pcps_opencl_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), @@ -95,7 +95,6 @@ pcps_opencl_acquisition_cc::pcps_opencl_acquisition_cc( d_active = false; d_state = 0; d_core_working = false; - d_queue = queue; d_freq = freq; d_fs_in = fs_in; d_samples_per_ms = samples_per_ms; @@ -780,7 +779,7 @@ int pcps_opencl_acquisition_cc::general_work(int noutput_items, case 2: { - // Declare positive acquisition using a message queue + // Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -804,7 +803,7 @@ int pcps_opencl_acquisition_cc::general_work(int noutput_items, case 3: { - // Declare negative acquisition using a message queue + // Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 872b913d3..33559cb3b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -10,7 +10,7 @@ *
    • Perform the FFT-based circular convolution (parallel time search) *
    • Record the maximum peak and the associated synchronization parameters *
    • Compute the test statistics and compare to the threshold - *
    • Declare positive or negative acquisition using a message queue + *
    • Declare positive or negative acquisition using a message port * * * Kay Borre book: K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen, @@ -55,10 +55,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "fft_internal.h" #include "gnss_synchro.h" @@ -77,7 +75,7 @@ pcps_make_opencl_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, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); /*! @@ -94,14 +92,14 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); pcps_opencl_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, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, @@ -138,7 +136,6 @@ private: float d_input_power; float d_test_statistics; bool d_bit_transition_flag; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index 5813d18c6..6e8a42373 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -47,10 +47,9 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc( unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename) { - return pcps_quicksync_acquisition_cc_sptr( new pcps_quicksync_acquisition_cc( folding_factor, @@ -58,17 +57,17 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc( freq, fs_in, samples_per_ms, samples_per_code, bit_transition_flag, - queue, dump, dump_filename)); + dump, dump_filename)); } + pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc( unsigned int folding_factor, 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, - gr::msg_queue::sptr queue, bool dump, - std::string dump_filename): + bool dump, std::string dump_filename): gr::block("pcps_quicksync_acquisition_cc", gr::io_signature::make(1, 1, (sizeof(gr_complex)*sampled_ms * samples_per_ms )), gr::io_signature::make(0, 0, (sizeof(gr_complex)*sampled_ms * samples_per_ms ))) @@ -77,7 +76,6 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc( 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; @@ -527,7 +525,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items, case 2: { //DLOG(INFO) << "START CASE 2"; - // 6.1- Declare positive acquisition using a message queue + // 6.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -556,7 +554,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items, case 3: { //DLOG(INFO) << "START CASE 3"; - // 6.2- Declare negative acquisition using a message queue + // 6.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 e5d8d560c..9538dffa4 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -11,7 +11,7 @@ *
    • Perform the FFT-based circular convolution (parallel time search) *
    • Record the maximum peak and the associated synchronization parameters *
    • Compute the test statistics and compare to the threshold -*
    • Declare positive or negative acquisition using a message queue +*
    • Declare positive or negative acquisition using a message port *
    • Obtain the adequate acquisition parameters by correlating the incoming * signal shifted by the possible folded delays * @@ -57,10 +57,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class pcps_quicksync_acquisition_cc; @@ -74,7 +72,7 @@ pcps_quicksync_make_acquisition_cc(unsigned int folding_factor, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); /*! @@ -93,7 +91,7 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); pcps_quicksync_acquisition_cc(unsigned int folding_factor, @@ -101,7 +99,7 @@ private: unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, bool bit_transition_flag, - gr::msg_queue::sptr queue, bool dump, + bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, @@ -145,7 +143,6 @@ private: float d_input_power; float d_test_statistics; bool d_bit_transition_flag; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index 449737067..0dbc0b943 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -63,19 +63,19 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc( unsigned int sampled_ms, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, unsigned int tong_init_val, - unsigned int tong_max_val, gr::msg_queue::sptr queue, + unsigned int tong_max_val, bool dump, std::string dump_filename) { return pcps_tong_acquisition_cc_sptr( new pcps_tong_acquisition_cc(sampled_ms, doppler_max, freq, fs_in, samples_per_ms, samples_per_code, - tong_init_val, tong_max_val, queue, dump, dump_filename)); + tong_init_val, tong_max_val, dump, dump_filename)); } pcps_tong_acquisition_cc::pcps_tong_acquisition_cc( unsigned int sampled_ms, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, unsigned int tong_init_val, - unsigned int tong_max_val, gr::msg_queue::sptr queue, + unsigned int tong_max_val, bool dump, std::string dump_filename) : gr::block("pcps_tong_acquisition_cc", gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms), @@ -85,7 +85,6 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc( 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; @@ -391,7 +390,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items, case 2: { - // 6.1- Declare positive acquisition using a message queue + // 6.1- Declare positive acquisition using a message port DLOG(INFO) << "positive acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; @@ -416,7 +415,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items, case 3: { - // 6.2- Declare negative acquisition using a message queue + // 6.2- Declare negative acquisition using a message port DLOG(INFO) << "negative acquisition"; DLOG(INFO) << "satellite " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN; DLOG(INFO) << "sample_stamp " << d_sample_counter; 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 559ea098d..bc7c416cc 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -54,10 +54,8 @@ #include #include #include -#include #include #include -#include "concurrent_queue.h" #include "gnss_synchro.h" class pcps_tong_acquisition_cc; @@ -68,7 +66,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(unsigned int sampled_ms, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, unsigned int tong_init_val, - unsigned int tong_max_val, gr::msg_queue::sptr queue, + unsigned int tong_max_val, bool dump, std::string dump_filename); /*! @@ -82,13 +80,13 @@ private: pcps_tong_make_acquisition_cc(unsigned int sampled_ms, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, unsigned int tong_init_val, - unsigned int tong_max_val, gr::msg_queue::sptr queue, + unsigned int tong_max_val, bool dump, std::string dump_filename); pcps_tong_acquisition_cc(unsigned int sampled_ms, unsigned int doppler_max, long freq, long fs_in, int samples_per_ms, int samples_per_code, unsigned int tong_init_val, - unsigned int tong_max_val, gr::msg_queue::sptr queue, + unsigned int tong_max_val, bool dump, std::string dump_filename); void calculate_magnitudes(gr_complex* fft_begin, int doppler_shift, @@ -123,7 +121,6 @@ private: float* d_magnitude; float d_input_power; float d_test_statistics; - gr::msg_queue::sptr d_queue; std::ofstream d_dump_file; bool d_active; int d_state; diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 65c3c1797..c0d28ff94 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -293,7 +293,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1C( } std::unique_ptr pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue); - std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_1C" + appendix1, acq, 1, 0, queue); + std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_1C" + appendix1, acq, 1, 0); std::unique_ptr trk_ = GetTrkBlock(configuration, "Tracking_1C"+ appendix2, trk, 1, 1); std::unique_ptr tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1C" + appendix3, tlm, 1, 1); @@ -347,7 +347,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2S( } std::unique_ptr pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue); - std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_2S" + appendix1 , acq, 1, 0, queue); + std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_2S" + appendix1 , acq, 1, 0); std::unique_ptr trk_ = GetTrkBlock(configuration, "Tracking_2S" + appendix2, trk, 1, 1); std::unique_ptr tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_2S" + appendix3, tlm, 1, 1); @@ -403,7 +403,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1B( } std::unique_ptr pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue); - std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_1B" + appendix1, acq, 1, 0, queue); + std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_1B" + appendix1, acq, 1, 0); std::unique_ptr trk_ = GetTrkBlock(configuration, "Tracking_1B" + appendix2, trk, 1, 1); std::unique_ptr tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1B" + appendix3, tlm, 1, 1); @@ -459,7 +459,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5X( } std::unique_ptr pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue); - std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_5X" + appendix1, acq, 1, 0, queue); + std::unique_ptr acq_ = GetAcqBlock(configuration, "Acquisition_5X" + appendix1, acq, 1, 0); std::unique_ptr trk_ = GetTrkBlock(configuration, "Tracking_5X" + appendix2, trk, 1, 1); std::unique_ptr tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_5X" + appendix3, tlm, 1, 1); @@ -854,19 +854,19 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("GPS_L1_CA_PCPS_Assisted_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsAssistedAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_Tong_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsTongAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_Multithread_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsMultithreadAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } @@ -874,7 +874,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("GPS_L1_CA_PCPS_OpenCl_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsOpenClAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } #endif @@ -882,13 +882,13 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition_Fine_Doppler") == 0) { std::unique_ptr block_(new GpsL1CaPcpsAcquisitionFineDoppler(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_QuickSync_Acquisition") == 0) { std::unique_ptr block_( new GpsL1CaPcpsQuickSyncAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0) @@ -900,25 +900,25 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("Galileo_E1_PCPS_8ms_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1Pcps8msAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_Tong_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1PcpsTongAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1PcpsCccwsrAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E5a_Noncoherent_IQ_Acquisition_CAF") == 0) { std::unique_ptr block_(new GalileoE5aNoncoherentIQAcquisitionCaf(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } @@ -926,7 +926,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else if (implementation.compare("Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition") == 0) { std::unique_ptr block_( new GalileoE1PcpsQuickSyncAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } @@ -1071,7 +1071,7 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( std::shared_ptr configuration, std::string role, std::string implementation, unsigned int in_streams, - unsigned int out_streams, boost::shared_ptr queue) + unsigned int out_streams) { std::unique_ptr block; // ACQUISITION BLOCKS --------------------------------------------------------- @@ -1084,19 +1084,19 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( else if (implementation.compare("GPS_L1_CA_PCPS_Assisted_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsAssistedAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_Tong_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsTongAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_Multithread_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsMultithreadAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } @@ -1104,7 +1104,7 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( else if (implementation.compare("GPS_L1_CA_PCPS_OpenCl_Acquisition") == 0) { std::unique_ptr block_(new GpsL1CaPcpsOpenClAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } #endif @@ -1112,13 +1112,13 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition_Fine_Doppler") == 0) { std::unique_ptr block_(new GpsL1CaPcpsAcquisitionFineDoppler(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L1_CA_PCPS_QuickSync_Acquisition") == 0) { std::unique_ptr block_( new GpsL1CaPcpsQuickSyncAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("GPS_L2_M_PCPS_Acquisition") == 0) @@ -1136,32 +1136,32 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( else if (implementation.compare("Galileo_E1_PCPS_8ms_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1Pcps8msAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_Tong_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1PcpsTongAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition") == 0) { std::unique_ptr block_(new GalileoE1PcpsCccwsrAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition") == 0) { std::unique_ptr block_( new GalileoE1PcpsQuickSyncAmbiguousAcquisition(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else if (implementation.compare("Galileo_E5a_Noncoherent_IQ_Acquisition_CAF") == 0) { std::unique_ptr block_(new GalileoE5aNoncoherentIQAcquisitionCaf(configuration.get(), role, in_streams, - out_streams, queue)); + out_streams)); block = std::move(block_); } else diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index b4e9b7c5a..827c4d7c1 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -104,7 +104,7 @@ private: std::shared_ptr configuration, std::string role, std::string implementation, unsigned int in_streams, - unsigned int out_streams, gr::msg_queue::sptr queue); + unsigned int out_streams); std::unique_ptr GetTrkBlock( std::shared_ptr configuration, diff --git a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index 7eb829e94..2bce44c2b 100644 --- a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -41,7 +41,6 @@ #include #include #include -#include #include #include "gnss_block_interface.h" #include "in_memory_configuration.h" diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 246b21a98..e89b62c97 100644 --- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -568,7 +568,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::stop_queue() TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, Instantiate) { config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } @@ -580,7 +580,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ConnectAndRun) struct timeval tv; long long int begin = 0; long long int end = 0; - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(channel_internal_queue); queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Acquisition test"); @@ -650,7 +650,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM) config_1(); queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Acquisition test"); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc index 03d478b31..5fea20e02 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include "gnss_block_interface.h" @@ -364,7 +363,7 @@ void GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test::stop_queue() TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, Instantiate) { config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, ConnectAndRun) @@ -377,7 +376,7 @@ TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -404,7 +403,7 @@ TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, ValidationOfResults) queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Acquisition test"); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->set_channel(1); @@ -486,7 +485,7 @@ TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, ValidationOfResultsProbabi queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Acquisition test"); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->set_channel(1); diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc index 9f701fc7d..88644220f 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc @@ -417,7 +417,7 @@ void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::stop_queue() TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, Instantiate) { config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ConnectAndRun) @@ -428,7 +428,7 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ConnectAndRun) long long int end = 0; config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { @@ -455,7 +455,7 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResults) { config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { @@ -537,7 +537,7 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResultsProbabilitie { config_2(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index c3bcb735c..521386469 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -536,7 +536,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::stop_queue() TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, Instantiate) { config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ConnectAndRun) @@ -550,7 +550,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ConnectAndRun) boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -580,7 +580,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResults) config_1(); top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { @@ -676,7 +676,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsWithNoise config_1(); top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { @@ -768,7 +768,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili config_2(); top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index da9978ddd..3eb949b94 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -417,7 +417,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test::stop_queue() TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, Instantiate) { config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ConnectAndRun) @@ -430,7 +430,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ConnectAndRun) queue = gr::msg_queue::make(0); config_1(); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { @@ -459,7 +459,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResults) top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { @@ -547,7 +547,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResultsProbabilities) config_2(); top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); - acquisition = std::make_shared(config.get(), "Acquisition", 1, 1, queue); + acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); boost::shared_ptr msg_rx = GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); ASSERT_NO_THROW( { diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 4d8d59860..e300d07ac 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -367,7 +367,7 @@ int main(int argc, char** argv) long fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); GNSSBlockFactory block_factory; - acquisition = new GpsL1CaPcpsAcquisitionFineDoppler(configuration.get(), "Acquisition", 1, 1, queue); + acquisition = new GpsL1CaPcpsAcquisitionFineDoppler(configuration.get(), "Acquisition", 1, 1); acquisition->set_channel(1); acquisition->set_gnss_synchro(gnss_synchro);