diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index b836d0f42..010027d8d 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -100,6 +100,7 @@ target_link_libraries(acquisition_adapters PUBLIC acquisition_gr_blocks Gnuradio::blocks + Volkgnsssdr::volkgnsssdr PRIVATE gnss_sdr_flags Boost::headers @@ -124,7 +125,6 @@ if(ENABLE_FPGA) algorithms_libs core_libs Volk::volk - Volkgnsssdr::volkgnsssdr ) endif() diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index d7566c0f8..180a95795 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -40,7 +40,10 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + threshold_(0.0), + channel_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -62,7 +65,7 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( num_codes_ = acq_parameters_.sampled_ms; code_length_ = static_cast(std::floor(static_cast(fs_in_) / (BEIDOU_B1I_CODE_RATE_CPS / BEIDOU_B1I_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); acquisition_ = pcps_make_acquisition(acq_parameters_); DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; @@ -73,10 +76,6 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -141,7 +140,7 @@ void BeidouB1iPcpsAcquisition::init() void BeidouB1iPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); beidou_b1i_code_gen_complex_sampled(code, gnss_synchro_->PRN, fs_in_, 0); diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index 60c6d8847..b56489784 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -26,10 +26,10 @@ #include "pcps_acquisition.h" #include #include +#include #include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -152,7 +152,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index 58a9a602a..f436a5bbf 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -38,7 +38,10 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + threshold_(0.0), + channel_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -60,7 +63,7 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( num_codes_ = acq_parameters_.sampled_ms; code_length_ = static_cast(std::floor(static_cast(fs_in_) / (BEIDOU_B3I_CODE_RATE_CPS / BEIDOU_B3I_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); acquisition_ = pcps_make_acquisition(acq_parameters_); DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; @@ -71,10 +74,6 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -138,7 +137,7 @@ void BeidouB3iPcpsAcquisition::init() void BeidouB3iPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); beidou_b3i_code_gen_complex_sampled(code, gnss_synchro_->PRN, fs_in_, 0); diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h index 1434ad88d..1e5b082bf 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h @@ -25,10 +25,10 @@ #include "pcps_acquisition.h" #include #include +#include #include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -151,7 +151,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 2c1f21e08..e36975a38 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -37,11 +37,16 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + configuration_(configuration), + role_(role), + threshold_(0.0), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 4; acq_parameters_.SetFromConfiguration(configuration_, role, GALILEO_E1_CODE_CHIP_RATE_CPS, GALILEO_E1_OPT_ACQ_FS_SPS); @@ -60,7 +65,7 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; @@ -73,11 +78,6 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -152,7 +152,7 @@ void GalileoE1PcpsAmbiguousAcquisition::set_local_code() bool cboc = configuration_->property( "Acquisition" + std::to_string(channel_) + ".cboc", false); - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); if (acquire_pilot_ == true) { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 0226e228b..730bf3b76 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -23,10 +23,10 @@ #include "complex_byte_to_float_x2.h" #include "gnss_synchro.h" #include "pcps_acquisition.h" +#include #include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -156,7 +156,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc index 59ebe3309..9e3deb0fe 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc @@ -35,7 +35,11 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -95,7 +99,7 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( auto fft_if = gnss_fft_fwd_make_unique(nsamples_total); // Direct FFT volk_gnsssdr::vector> code(nsamples_total); // buffer for the local code volk_gnsssdr::vector fft_codes_padded(nsamples_total); - d_all_fft_codes_ = std::vector(nsamples_total * GALILEO_E1_NUMBER_OF_CODES); // memory containing all the possible fft codes for PRN 0 to 32 + d_all_fft_codes_ = volk_gnsssdr::vector(nsamples_total * GALILEO_E1_NUMBER_OF_CODES); // memory containing all the possible fft codes for PRN 0 to 32 float max; // temporary maxima search int32_t tmp; @@ -172,10 +176,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - channel_ = 0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index 730e496fe..95283fae5 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h @@ -22,6 +22,7 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition_fpga.h" +#include #include #include #include @@ -191,7 +192,7 @@ private: static const uint32_t shl_code_bits = 65536; // shift left by 10 bits pcps_acquisition_fpga_sptr acquisition_fpga_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + volk_gnsssdr::vector d_all_fft_codes_; // memory that contains all the code ffts std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; std::string dump_filename_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc index a0625b277..6e8574586 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc @@ -37,7 +37,12 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + threshold_(0.0), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -65,18 +70,13 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GALILEO_E5A_CODE_CHIP_RATE_CPS / GALILEO_E5A_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; acquisition_ = pcps_make_acquisition(acq_parameters_); DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -145,7 +145,7 @@ void GalileoE5aPcpsAcquisition::init() void GalileoE5aPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); std::array signal_{}; signal_[0] = '5'; signal_[2] = '\0'; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h index a75dc5b49..0a300e883 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h @@ -22,9 +22,9 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition.h" +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -149,7 +149,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; Acq_Conf acq_parameters_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index ca26fba62..8f68bc73c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -34,7 +34,11 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -96,7 +100,7 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga( auto fft_if = gnss_fft_fwd_make_unique(nsamples_total); // Direct FFT volk_gnsssdr::vector> code(nsamples_total); volk_gnsssdr::vector> fft_codes_padded(nsamples_total); - d_all_fft_codes_ = std::vector(nsamples_total * GALILEO_E5A_NUMBER_OF_CODES); // memory containing all the possible fft codes for PRN 0 to 32 + d_all_fft_codes_ = volk_gnsssdr::vector(nsamples_total * GALILEO_E5A_NUMBER_OF_CODES); // memory containing all the possible fft codes for PRN 0 to 32 float max; // temporary maxima search int32_t tmp; @@ -175,10 +179,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga( acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - channel_ = 0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index 40ea03f61..11321bf68 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -22,9 +22,9 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition_fpga.h" +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -200,7 +200,7 @@ private: pcps_acquisition_fpga_sptr acquisition_fpga_; std::weak_ptr channel_fsm_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + volk_gnsssdr::vector d_all_fft_codes_; // memory that contains all the code ffts Gnss_Synchro* gnss_synchro_; std::string role_; std::string item_type_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc index 4b5b63c0e..8fa09c554 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc @@ -37,7 +37,12 @@ namespace own = gsl; GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + threshold_(0.0), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -65,18 +70,13 @@ GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterfac code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GALILEO_E5B_CODE_CHIP_RATE_CPS / GALILEO_E5B_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0F : 1.0F)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; acquisition_ = pcps_make_acquisition(acq_parameters_); DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -143,7 +143,7 @@ void GalileoE5bPcpsAcquisition::init() void GalileoE5bPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); std::array signal_{}; signal_[0] = '7'; signal_[2] = '\0'; diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h index cc8b26cdd..48c2bd4d2 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h @@ -23,9 +23,9 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition.h" +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -181,7 +181,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc index bc0d8b3bc..39ecea729 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc @@ -26,15 +26,18 @@ #include #include // for gr_complex #include // for volk_32fc_conjugate_32fc -#include -#include // for copy_n -#include // for abs, pow, floor -#include // for complex +#include // for copy_n +#include // for abs, pow, floor +#include // for complex GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -96,7 +99,7 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration auto fft_if = gnss_fft_fwd_make_unique(nsamples_total); // Direct FFT volk_gnsssdr::vector> code(nsamples_total); // Buffer for local code volk_gnsssdr::vector> fft_codes_padded(nsamples_total); - d_all_fft_codes_ = std::vector(nsamples_total * GALILEO_E5B_NUMBER_OF_CODES); // memory containing all the possible fft codes for PRN 0 to 32 + d_all_fft_codes_ = volk_gnsssdr::vector(nsamples_total * GALILEO_E5B_NUMBER_OF_CODES); // memory containing all the possible fft codes for PRN 0 to 32 float max; // temporary maxima search int32_t tmp; @@ -175,10 +178,6 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - channel_ = 0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h index bdffb5d08..6563bb0aa 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h @@ -23,9 +23,9 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition_fpga.h" +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -198,7 +198,7 @@ private: static const uint32_t shl_code_bits = 65536; // shift left by 10 bits pcps_acquisition_fpga_sptr acquisition_fpga_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + volk_gnsssdr::vector d_all_fft_codes_; // memory that contains all the code ffts std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; diff --git a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc index 942c83a21..f72d1f6b5 100644 --- a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.cc @@ -36,11 +36,15 @@ GalileoE6PcpsAcquisition::GalileoE6PcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + configuration_(configuration), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; acq_parameters_.SetFromConfiguration(configuration_, role, GALILEO_E6_B_CODE_CHIP_RATE_CPS, GALILEO_E6_OPT_ACQ_FS_SPS); @@ -58,7 +62,7 @@ GalileoE6PcpsAcquisition::GalileoE6PcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GALILEO_E6_B_CODE_CHIP_RATE_CPS / GALILEO_E6_B_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; @@ -71,11 +75,6 @@ GalileoE6PcpsAcquisition::GalileoE6PcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -147,7 +146,7 @@ void GalileoE6PcpsAcquisition::init() void GalileoE6PcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); if (acq_parameters_.use_automatic_resampler) { diff --git a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h index fa1e13f57..21e2e166f 100644 --- a/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e6_pcps_acquisition.h @@ -24,9 +24,9 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -156,7 +156,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc index d75d66675..adef890db 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc @@ -38,7 +38,10 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -59,7 +62,7 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GLONASS_L1_CA_CODE_RATE_CPS / GLONASS_L1_CA_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; @@ -72,11 +75,6 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -142,7 +140,7 @@ void GlonassL1CaPcpsAcquisition::init() void GlonassL1CaPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); glonass_l1_ca_code_gen_complex_sampled(code, fs_in_, 0); diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h index 9c9df439d..938fe0021 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -26,9 +26,9 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -150,7 +150,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc index c2a578abb..559f85cab 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc @@ -37,7 +37,10 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -58,7 +61,7 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GLONASS_L2_CA_CODE_RATE_CPS / GLONASS_L2_CA_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; @@ -71,11 +74,6 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -141,7 +139,7 @@ void GlonassL2CaPcpsAcquisition::init() void GlonassL2CaPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); glonass_l2_ca_code_gen_complex_sampled(code, fs_in_, 0); diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h index 1fea1db7e..3927bd4f2 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h @@ -25,9 +25,9 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -149,7 +149,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index 71c0cb9f6..72994eebc 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -40,7 +40,12 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + threshold_(0.0), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -61,7 +66,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); sampled_ms_ = acq_parameters_.sampled_ms; @@ -74,11 +79,6 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -150,7 +150,7 @@ void GpsL1CaPcpsAcquisition::init() void GpsL1CaPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); if (acq_parameters_.use_automatic_resampler) { 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 8d52ca14e..6ad39ab03 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -28,9 +28,9 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include +#include #include #include -#include /** \addtogroup Acquisition * Classes for GNSS signal acquisition @@ -162,7 +162,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; std::weak_ptr channel_fsm_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc index 5362f78bc..9263b3947 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc @@ -28,7 +28,6 @@ #include #include // for gr_complex #include // for volk_32fc_conjugate_32fc -#include #include // for copy_n #include // for abs, pow, floor #include // for complex @@ -37,7 +36,11 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -89,7 +92,7 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( // allocate memory to compute all the PRNs and compute all the possible codes volk_gnsssdr::vector> code(nsamples_total); volk_gnsssdr::vector> fft_codes_padded(nsamples_total); - d_all_fft_codes_ = std::vector(nsamples_total * NUM_PRNs); // memory containing all the possible fft codes for PRN 0 to 32 + d_all_fft_codes_ = volk_gnsssdr::vector(nsamples_total * NUM_PRNs); // memory containing all the possible fft codes for PRN 0 to 32 float max; int32_t tmp; int32_t tmp2; @@ -151,10 +154,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - channel_ = 0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index 2230c8d72..a69c8839f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h @@ -25,9 +25,9 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition_fpga.h" +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -196,7 +196,7 @@ private: pcps_acquisition_fpga_sptr acquisition_fpga_; std::weak_ptr channel_fsm_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + volk_gnsssdr::vector d_all_fft_codes_; // memory that contains all the code ffts Gnss_Synchro* gnss_synchro_; std::string role_; int32_t doppler_center_; diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index 7198250db..d3a5b2ab8 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -38,7 +38,11 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -59,7 +63,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GPS_L2_M_CODE_RATE_CPS / GPS_L2_M_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); acquisition_ = pcps_make_acquisition(acq_parameters_); DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")"; @@ -70,11 +74,6 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - num_codes_ = acq_parameters_.sampled_ms / acq_parameters_.ms_per_code; if (in_streams_ > 1) { @@ -149,7 +148,7 @@ void GpsL2MPcpsAcquisition::init() void GpsL2MPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); if (acq_parameters_.use_automatic_resampler) { diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index fbb10a68e..8a3627f81 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -25,6 +25,7 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include +#include #include #include #include @@ -157,7 +158,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; std::weak_ptr channel_fsm_; diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc index b3d0d117d..62df23bc2 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc @@ -37,7 +37,10 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -89,7 +92,7 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( // allocate memory to compute all the PRNs and compute all the possible codes volk_gnsssdr::vector> code(nsamples_total); volk_gnsssdr::vector> fft_codes_padded(nsamples_total); - d_all_fft_codes_ = std::vector(nsamples_total * NUM_PRNs); // memory containing all the possible fft codes for PRN 0 to 32 + d_all_fft_codes_ = volk_gnsssdr::vector(nsamples_total * NUM_PRNs); // memory containing all the possible fft codes for PRN 0 to 32 float max; // temporary maxima search int32_t tmp; diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index 4fb4d3807..916cd3ea4 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h @@ -23,10 +23,10 @@ #include "channel_fsm.h" #include "pcps_acquisition_fpga.h" #include // for basic_block_sptr, top_block_sptr -#include // for size_t -#include // for weak_ptr -#include // for string -#include +#include +#include // for size_t +#include // for weak_ptr +#include // for string /** \addtogroup Acquisition * \{ */ @@ -158,7 +158,7 @@ private: static const uint32_t SHL_CODE_BITS = 65536; // shift left by 10 bits pcps_acquisition_fpga_sptr acquisition_fpga_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + volk_gnsssdr::vector d_all_fft_codes_; // memory that contains all the code ffts std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; std::string item_type_; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index e34a0086b..35b889994 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -37,7 +37,12 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + threshold_(0.0), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -58,7 +63,7 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GPS_L5I_CODE_RATE_CPS / GPS_L5I_CODE_LENGTH_CHIPS))); vector_length_ = static_cast(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0)); - code_ = std::vector>(vector_length_); + code_ = volk_gnsssdr::vector>(vector_length_); fs_in_ = acq_parameters_.fs_in; num_codes_ = acq_parameters_.sampled_ms; @@ -72,11 +77,6 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( float_to_complex_ = gr::blocks::float_to_complex::make(); } - channel_ = 0; - threshold_ = 0.0; - doppler_center_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; @@ -150,7 +150,7 @@ void GpsL5iPcpsAcquisition::init() void GpsL5iPcpsAcquisition::set_local_code() { - std::vector> code(code_length_); + volk_gnsssdr::vector> code(code_length_); if (acq_parameters_.use_automatic_resampler) { diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 18a087778..820329821 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -25,9 +25,9 @@ #include "gnss_synchro.h" #include "pcps_acquisition.h" #include +#include #include #include -#include /** \addtogroup Acquisition * \{ */ @@ -157,7 +157,7 @@ public: private: pcps_acquisition_sptr acquisition_; - std::vector> code_; + volk_gnsssdr::vector> code_; gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; std::weak_ptr channel_fsm_; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc index fe9a7a605..682e7b1e4 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc @@ -37,7 +37,11 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, - unsigned int out_streams) : role_(role), + unsigned int out_streams) : gnss_synchro_(nullptr), + role_(role), + doppler_center_(0), + channel_(0), + doppler_step_(0), in_streams_(in_streams), out_streams_(out_streams) { @@ -92,7 +96,7 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( auto fft_if = gnss_fft_fwd_make_unique(nsamples_total); // Direct FFT volk_gnsssdr::vector> code(nsamples_total); volk_gnsssdr::vector> fft_codes_padded(nsamples_total); - d_all_fft_codes_ = std::vector(nsamples_total * NUM_PRNs); // memory containing all the possible fft codes for PRN 0 to 32 + d_all_fft_codes_ = volk_gnsssdr::vector(nsamples_total * NUM_PRNs); // memory containing all the possible fft codes for PRN 0 to 32 float max; // temporary maxima search int32_t tmp; @@ -153,10 +157,6 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); - channel_ = 0; - doppler_step_ = 0; - gnss_synchro_ = nullptr; - if (in_streams_ > 1) { LOG(ERROR) << "This implementation only supports one input stream"; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index 25d76d6c2..e1c5eedb2 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -24,6 +24,7 @@ #include "channel_fsm.h" #include "gnss_synchro.h" #include "pcps_acquisition_fpga.h" +#include #include #include #include @@ -198,7 +199,7 @@ private: pcps_acquisition_fpga_sptr acquisition_fpga_; std::weak_ptr channel_fsm_; - std::vector d_all_fft_codes_; // memory that contains all the code ffts + volk_gnsssdr::vector d_all_fft_codes_; // memory that contains all the code ffts Gnss_Synchro* gnss_synchro_; std::string item_type_; std::string dump_filename_;