diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc index 911c9e36e..79d35746f 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.cc +++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc @@ -39,7 +39,7 @@ namespace bc = boost::integer; #endif -Rtklib_Pvt::Rtklib_Pvt(ConfigurationInterface* configuration, +Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h index 3e44c3f36..4beee76aa 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.h +++ b/src/algorithms/PVT/adapters/rtklib_pvt.h @@ -44,7 +44,7 @@ class Gps_Ephemeris; class Rtklib_Pvt : public PvtInterface { public: - Rtklib_Pvt(ConfigurationInterface* configuration, + Rtklib_Pvt(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index e930fba94..2fb560536 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -40,16 +40,15 @@ namespace own = gsl; BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, BEIDOU_B1I_CODE_RATE_CPS, 10e6); + acq_parameters_.SetFromConfiguration(configuration, role, BEIDOU_B1I_CODE_RATE_CPS, 10e6); LOG(INFO) << "role " << role; diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index d502c6d25..cd7830378 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -44,7 +44,7 @@ class ConfigurationInterface; class BeidouB1iPcpsAcquisition : public AcquisitionInterface { public: - BeidouB1iPcpsAcquisition(ConfigurationInterface* configuration, + BeidouB1iPcpsAcquisition(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -155,7 +155,6 @@ private: gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string role_; diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index 599ea00e8..a1e26ffef 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -38,16 +38,15 @@ namespace own = gsl; using google::LogMessage; BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, BEIDOU_B3I_CODE_RATE_CPS, 100e6); + acq_parameters_.SetFromConfiguration(configuration, role, BEIDOU_B3I_CODE_RATE_CPS, 100e6); LOG(INFO) << "role " << role; diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h index dce64b797..9b7940c6d 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h @@ -43,7 +43,7 @@ class ConfigurationInterface; class BeidouB3iPcpsAcquisition : public AcquisitionInterface { public: - BeidouB3iPcpsAcquisition(ConfigurationInterface* configuration, + BeidouB3iPcpsAcquisition(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -154,7 +154,6 @@ private: gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string role_; 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 73ab611a3..5fb5dbcc8 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 @@ -36,7 +36,7 @@ namespace own = gsl; #endif GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 55b77b698..861144c40 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 @@ -38,7 +38,7 @@ class ConfigurationInterface; class GalileoE1Pcps8msAmbiguousAcquisition : public AcquisitionInterface { public: - GalileoE1Pcps8msAmbiguousAcquisition(ConfigurationInterface* configuration, + GalileoE1Pcps8msAmbiguousAcquisition(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -139,29 +139,30 @@ public: private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + + const ConfigurationInterface* configuration_; galileo_pcps_8ms_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> code_; + Gnss_Synchro* gnss_synchro_; std::string item_type_; + std::string dump_filename_; + std::string role_; + int64_t fs_in_; + size_t item_size_; + float threshold_; unsigned int vector_length_; unsigned int code_length_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool dump_; }; #endif // GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H 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 afdc52046..631aa964a 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -37,7 +37,7 @@ namespace own = gsl; #endif GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 d5a8e9d73..5844bbec9 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -41,7 +41,8 @@ class ConfigurationInterface; class GalileoE1PcpsAmbiguousAcquisition : public AcquisitionInterface { public: - GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration, + GalileoE1PcpsAmbiguousAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -158,7 +159,7 @@ private: gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; + const ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 92e9ea00c..192c4ba9d 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 @@ -34,7 +34,7 @@ #include // for complex GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), @@ -42,33 +42,32 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( out_streams_(out_streams) { pcpsconf_fpga_t acq_parameters; - configuration_ = configuration; std::string default_dump_filename = "./data/acquisition.dat"; DLOG(INFO) << "role " << role; - int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); - int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 4000000); + int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false); DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; - uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 4); + uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 4); acq_parameters.downsampling_factor = downsampling_factor; fs_in = fs_in / downsampling_factor; acq_parameters.fs_in = fs_in; - doppler_max_ = configuration_->property(role + ".doppler_max", 5000); + doppler_max_ = configuration->property(role + ".doppler_max", 5000); if (FLAGS_doppler_max != 0) { doppler_max_ = FLAGS_doppler_max; } acq_parameters.doppler_max = doppler_max_; - acquire_pilot_ = configuration_->property(role + ".acquire_pilot", false); // could be true in future versions + acquire_pilot_ = configuration->property(role + ".acquire_pilot", false); // could be true in future versions // Find number of samples per spreading code (4 ms) auto code_length = static_cast(std::round(static_cast(fs_in) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS))); @@ -77,11 +76,11 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( // The FPGA can only use FFT lengths that are a power of two. float nbits = ceilf(log2f(static_cast(code_length) * 2.0)); uint32_t nsamples_total = pow(2, nbits); - uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 0); + uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 0); acq_parameters.select_queue_Fpga = select_queue_Fpga; std::string default_device_name = "/dev/uio0"; - std::string device_name = configuration_->property(role + ".devicename", default_device_name); + std::string device_name = configuration->property(role + ".devicename", default_device_name); acq_parameters.device_name = device_name; acq_parameters.samples_per_code = nsamples_total; acq_parameters.excludelimit = static_cast(1 + ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_CPS) * static_cast(fs_in))); @@ -159,12 +158,12 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( acq_parameters.all_fft_codes = d_all_fft_codes_.data(); - acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); - acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); - acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); - acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2); + acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4); + acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0); + acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false); + acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); // reference for the FPGA FFT-IFFT attenuation factor - acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 13); + acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 13); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); 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 58a107736..d66a1998c 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 @@ -42,7 +42,8 @@ public: /*! * \brief Constructor */ - GalileoE1PcpsAmbiguousAcquisitionFpga(ConfigurationInterface* configuration, + GalileoE1PcpsAmbiguousAcquisitionFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -189,7 +190,6 @@ private: std::vector d_all_fft_codes_; // memory that contains all the code ffts std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; std::string dump_filename_; std::string role_; int32_t doppler_center_; 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 76e0beb40..402a10b87 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 @@ -28,7 +28,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 b2540f198..071b21093 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 @@ -38,7 +38,8 @@ class ConfigurationInterface; class GalileoE1PcpsCccwsrAmbiguousAcquisition : public AcquisitionInterface { public: - GalileoE1PcpsCccwsrAmbiguousAcquisition(ConfigurationInterface* configuration, + GalileoE1PcpsCccwsrAmbiguousAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -138,30 +139,31 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + + const ConfigurationInterface* configuration_; pcps_cccwsr_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> code_data_; + std::vector> code_pilot_; std::string item_type_; + std::string dump_filename_; + std::string role_; + Gnss_Synchro* gnss_synchro_; + int64_t fs_in_; + size_t item_size_; + float threshold_; unsigned int vector_length_; unsigned int code_length_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_data_; - std::vector> code_pilot_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool dump_; }; #endif // GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H 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 7d5a8cfed..92dda1fe5 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 @@ -36,7 +36,7 @@ namespace own = gsl; #endif GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 f5a07fa48..852387c47 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 @@ -39,7 +39,8 @@ class ConfigurationInterface; class GalileoE1PcpsQuickSyncAmbiguousAcquisition : public AcquisitionInterface { public: - GalileoE1PcpsQuickSyncAmbiguousAcquisition(ConfigurationInterface* configuration, + GalileoE1PcpsQuickSyncAmbiguousAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -141,31 +142,32 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + + const ConfigurationInterface* configuration_; pcps_quicksync_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> code_; std::string item_type_; + std::string role_; + std::string dump_filename_; + Gnss_Synchro* gnss_synchro_; + int64_t fs_in_; + size_t item_size_; + float threshold_; unsigned int vector_length_; unsigned int code_length_; - bool bit_transition_flag_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int max_dwells_; unsigned int folding_factor_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool bit_transition_flag_; + bool dump_; }; #endif // GNSS_SDR_GALILEO_E1_PCPS_QUICKSYNC_AMBIGUOUS_ACQUISITION_H 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 90b35f9a3..db2ab95f8 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 @@ -36,7 +36,7 @@ namespace own = gsl; #endif GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 ff0d5b67d..66596a372 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 @@ -38,7 +38,8 @@ class ConfigurationInterface; class GalileoE1PcpsTongAmbiguousAcquisition : public AcquisitionInterface { public: - GalileoE1PcpsTongAmbiguousAcquisition(ConfigurationInterface* configuration, + GalileoE1PcpsTongAmbiguousAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -140,31 +141,31 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + const ConfigurationInterface* configuration_; pcps_tong_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> code_; + Gnss_Synchro* gnss_synchro_; std::string item_type_; + std::string dump_filename_; + std::string role_; + int64_t fs_in_; + size_t item_size_; + float threshold_; unsigned int vector_length_; unsigned int code_length_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int tong_init_val_; unsigned int tong_max_val_; unsigned int tong_max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool dump_; }; #endif // GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H 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 0a415441e..268b70a7b 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 @@ -42,7 +42,7 @@ namespace own = gsl; #endif GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 04cf73f2b..2b6e6a6f0 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,7 @@ class ConfigurationInterface; class GalileoE5aNoncoherentIQAcquisitionCaf : public AcquisitionInterface { public: - GalileoE5aNoncoherentIQAcquisitionCaf(ConfigurationInterface* configuration, + GalileoE5aNoncoherentIQAcquisitionCaf(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -144,33 +144,34 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + + const ConfigurationInterface* configuration_; galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr acquisition_cc_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> codeI_; + std::vector> codeQ_; std::string item_type_; + std::string role_; + std::string dump_filename_; + Gnss_Synchro* gnss_synchro_; + int64_t fs_in_; + size_t item_size_; + float threshold_; + int Zero_padding; + int CAF_window_hz_; unsigned int vector_length_; unsigned int code_length_; - bool bit_transition_flag_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - int Zero_padding; - int CAF_window_hz_; - std::vector> codeI_; - std::vector> codeQ_; - bool both_signal_components; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool bit_transition_flag_; + bool both_signal_components; + bool dump_; }; #endif // GNSS_SDR_GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc index 785e3500f..c67c72c38 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc @@ -35,16 +35,16 @@ namespace own = std; namespace own = gsl; #endif -GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* configuration, +GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_OPT_ACQ_FS_SPS); + acq_parameters_.SetFromConfiguration(configuration, role, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_OPT_ACQ_FS_SPS); DLOG(INFO) << "Role " << role; @@ -58,8 +58,8 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; - acq_pilot_ = configuration_->property(role + ".acquire_pilot", false); - acq_iq_ = configuration_->property(role + ".acquire_iq", false); + acq_pilot_ = configuration->property(role + ".acquire_pilot", false); + acq_iq_ = configuration->property(role + ".acquire_iq", false); if (acq_iq_) { acq_pilot_ = false; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h index 2f574abf7..ebd9869f5 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h @@ -33,7 +33,8 @@ class ConfigurationInterface; class GalileoE5aPcpsAcquisition : public AcquisitionInterface { public: - GalileoE5aPcpsAcquisition(ConfigurationInterface* configuration, + GalileoE5aPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -147,7 +148,6 @@ private: std::vector> code_; std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 ddfbbd589..35dc7bf9e 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -33,7 +33,8 @@ #include // for abs, pow, floor #include // for complex -GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration, +GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), @@ -41,32 +42,31 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf out_streams_(out_streams) { pcpsconf_fpga_t acq_parameters; - configuration_ = configuration; std::string default_dump_filename = "../data/acquisition.dat"; DLOG(INFO) << "Role " << role; - int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000); - int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 32000000); + int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false); DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; - uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 1); + uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 1); acq_parameters.downsampling_factor = downsampling_factor; fs_in = fs_in / downsampling_factor; acq_parameters.fs_in = fs_in; - doppler_max_ = configuration_->property(role + ".doppler_max", 5000); + doppler_max_ = configuration->property(role + ".doppler_max", 5000); if (FLAGS_doppler_max != 0) { doppler_max_ = FLAGS_doppler_max; } acq_parameters.doppler_max = doppler_max_; - acq_pilot_ = configuration_->property(role + ".acquire_pilot", false); - acq_iq_ = configuration_->property(role + ".acquire_iq", false); + acq_pilot_ = configuration->property(role + ".acquire_pilot", false); + acq_iq_ = configuration->property(role + ".acquire_iq", false); if (acq_iq_) { acq_pilot_ = false; @@ -78,10 +78,10 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf // The FPGA can only use FFT lengths that are a power of two. float nbits = ceilf(log2f(static_cast(code_length) * 2.0)); uint32_t nsamples_total = pow(2, nbits); - uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 1); + uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 1); acq_parameters.select_queue_Fpga = select_queue_Fpga; std::string default_device_name = "/dev/uio0"; - std::string device_name = configuration_->property(role + ".devicename", default_device_name); + std::string device_name = configuration->property(role + ".devicename", default_device_name); acq_parameters.device_name = device_name; acq_parameters.samples_per_code = nsamples_total; @@ -163,12 +163,12 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf acq_parameters.all_fft_codes = d_all_fft_codes_.data(); // reference for the FPGA FFT-IFFT attenuation factor - acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 13); + acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 13); - acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); - acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); - acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); - acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2); + acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4); + acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0); + acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false); + acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); channel_ = 0; 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 14dd1bf03..406f84b10 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -42,7 +42,8 @@ public: /*! * \brief Constructor */ - GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration, + GalileoE5aPcpsAcquisitionFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -196,7 +197,6 @@ private: std::weak_ptr channel_fsm_; std::vector d_all_fft_codes_; // memory that contains all the code ffts Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; std::string role_; std::string item_type_; std::string dump_filename_; 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 7e0a28e5b..1eb304381 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc @@ -38,16 +38,15 @@ namespace own = gsl; #endif GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, GLONASS_L1_CA_CODE_RATE_CPS, 100e6); + acq_parameters_.SetFromConfiguration(configuration, role, GLONASS_L1_CA_CODE_RATE_CPS, 100e6); DLOG(INFO) << "role " << role; 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 c2f204da9..5ee5a14ba 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -42,7 +42,8 @@ class ConfigurationInterface; class GlonassL1CaPcpsAcquisition : public AcquisitionInterface { public: - GlonassL1CaPcpsAcquisition(ConfigurationInterface* configuration, + GlonassL1CaPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -151,7 +152,6 @@ private: gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 cf01ba49b..f5f280e64 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc @@ -37,16 +37,15 @@ namespace own = gsl; #endif GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, GLONASS_L2_CA_CODE_RATE_CPS, 100e6); + acq_parameters_.SetFromConfiguration(configuration, role, GLONASS_L2_CA_CODE_RATE_CPS, 100e6); DLOG(INFO) << "role " << role; 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 7fa249f74..53bedf1ce 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h @@ -41,7 +41,8 @@ class ConfigurationInterface; class GlonassL2CaPcpsAcquisition : public AcquisitionInterface { public: - GlonassL2CaPcpsAcquisition(ConfigurationInterface* configuration, + GlonassL2CaPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -150,7 +151,6 @@ private: gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 c72471cc6..367f77f4b 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -40,16 +40,15 @@ namespace own = gsl; #endif GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, GPS_L1_CA_CODE_RATE_CPS, GPS_L1_CA_OPT_ACQ_FS_SPS); + acq_parameters_.SetFromConfiguration(configuration, role, GPS_L1_CA_CODE_RATE_CPS, GPS_L1_CA_OPT_ACQ_FS_SPS); DLOG(INFO) << "role " << role; 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 3726632d3..500063a99 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -45,7 +45,8 @@ class ConfigurationInterface; class GpsL1CaPcpsAcquisition : public AcquisitionInterface { public: - GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration, + GpsL1CaPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -162,7 +163,6 @@ private: gr::blocks::float_to_complex::sptr float_to_complex_; complex_byte_to_float_x2_sptr cbyte_to_float_x2_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 02eedf4ed..e05e83b8c 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 @@ -31,7 +31,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 1408e85f4..80cd9380a 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 @@ -45,7 +45,7 @@ class ConfigurationInterface; class GpsL1CaPcpsAcquisitionFineDoppler : public AcquisitionInterface { public: - GpsL1CaPcpsAcquisitionFineDoppler(ConfigurationInterface* configuration, + GpsL1CaPcpsAcquisitionFineDoppler(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -152,24 +152,24 @@ public: private: pcps_acquisition_fine_doppler_cc_sptr acquisition_cc_; - size_t item_size_; - std::string item_type_; - unsigned int vector_length_; - unsigned int channel_; std::weak_ptr channel_fsm_; + std::vector> code_; + std::string item_type_; + std::string dump_filename_; + std::string role_; + Gnss_Synchro* gnss_synchro_; + int64_t fs_in_; + size_t item_size_; float threshold_; int doppler_max_; + int max_dwells_; + unsigned int vector_length_; + unsigned int channel_; unsigned int doppler_step_; unsigned int sampled_ms_; - int max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; + bool dump_; }; #endif // GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H 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 35bceda00..dd8c62c1b 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 @@ -37,7 +37,7 @@ #include // for complex GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), @@ -45,22 +45,21 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( out_streams_(out_streams) { pcpsconf_fpga_t acq_parameters; - configuration_ = configuration; DLOG(INFO) << "role " << role; - int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); - int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); + int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false); DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; - uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 4); + uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 4); acq_parameters.downsampling_factor = downsampling_factor; fs_in = fs_in / downsampling_factor; acq_parameters.fs_in = fs_in; - doppler_max_ = configuration_->property(role + ".doppler_max", 5000); + doppler_max_ = configuration->property(role + ".doppler_max", 5000); if (FLAGS_doppler_max != 0) { doppler_max_ = FLAGS_doppler_max; @@ -71,10 +70,10 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( // The FPGA can only use FFT lengths that are a power of two. float nbits = ceilf(log2f(static_cast(code_length) * 2.0)); uint32_t nsamples_total = pow(2, nbits); - uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 0); + uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 0); acq_parameters.select_queue_Fpga = select_queue_Fpga; std::string default_device_name = "/dev/uio0"; - std::string device_name = configuration_->property(role + ".devicename", default_device_name); + std::string device_name = configuration->property(role + ".devicename", default_device_name); acq_parameters.device_name = device_name; acq_parameters.samples_per_code = nsamples_total; acq_parameters.excludelimit = static_cast(1 + ceil(GPS_L1_CA_CHIP_PERIOD_S * static_cast(fs_in))); @@ -139,12 +138,12 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( acq_parameters.all_fft_codes = d_all_fft_codes_.data(); // reference for the FPGA FFT-IFFT attenuation factor - acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 10); + acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 10); - acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); - acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); - acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); - acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2); + acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4); + acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0); + acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false); + acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); channel_ = 0; 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 eb74091a3..bcbf0585f 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 @@ -45,7 +45,7 @@ public: /*! * \brief Constructor */ - GpsL1CaPcpsAcquisitionFpga(ConfigurationInterface* configuration, + GpsL1CaPcpsAcquisitionFpga(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -194,7 +194,6 @@ private: std::weak_ptr channel_fsm_; std::vector d_all_fft_codes_; // memory that contains all the code ffts Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; std::string role_; int32_t doppler_center_; uint32_t channel_; 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 8f55eabaf..cfd699147 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 @@ -30,7 +30,7 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 157d22e44..4c462bec0 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 @@ -38,7 +38,8 @@ class ConfigurationInterface; class GpsL1CaPcpsAssistedAcquisition : public AcquisitionInterface { public: - GpsL1CaPcpsAssistedAcquisition(ConfigurationInterface* configuration, + GpsL1CaPcpsAssistedAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -135,25 +136,30 @@ public: private: pcps_assisted_acquisition_cc_sptr acquisition_cc_; - size_t item_size_; - std::string item_type_; - unsigned int vector_length_; - unsigned int channel_; std::weak_ptr channel_fsm_; + std::vector> code_; + + std::string item_type_; + std::string dump_filename_; + std::string role_; + + Gnss_Synchro* gnss_synchro_; + + size_t item_size_; + int64_t fs_in_; + float threshold_; int doppler_max_; - unsigned int doppler_step_; int doppler_min_; - unsigned int sampled_ms_; int max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; + unsigned int vector_length_; + unsigned int channel_; + unsigned int doppler_step_; + unsigned int sampled_ms_; unsigned int in_streams_; unsigned int out_streams_; + + bool dump_; }; #endif // GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H 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 c19f64295..987cc6308 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 @@ -36,7 +36,7 @@ namespace own = gsl; #endif GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), @@ -49,31 +49,31 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition( DLOG(INFO) << "role " << role; - item_type_ = configuration_->property(role + ".item_type", + item_type_ = configuration->property(role + ".item_type", default_item_type); - int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); - fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - dump_ = configuration_->property(role + ".dump", false); + int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); + fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + dump_ = configuration->property(role + ".dump", false); doppler_max_ = configuration->property(role + ".doppler_max", 5000); if (FLAGS_doppler_max != 0) { doppler_max_ = FLAGS_doppler_max; } - sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1); + sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1); - bit_transition_flag_ = configuration_->property("Acquisition.bit_transition_flag", false); + bit_transition_flag_ = configuration->property("Acquisition.bit_transition_flag", false); if (!bit_transition_flag_) { - max_dwells_ = configuration_->property(role + ".max_dwells", 1); + max_dwells_ = configuration->property(role + ".max_dwells", 1); } else { max_dwells_ = 2; } - dump_filename_ = configuration_->property(role + ".dump_filename", + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); // -- Find number of samples per spreading code ------------------------- 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 258bb13c2..2022005e6 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 @@ -38,7 +38,7 @@ class ConfigurationInterface; class GpsL1CaPcpsOpenClAcquisition : public AcquisitionInterface { public: - GpsL1CaPcpsOpenClAcquisition(ConfigurationInterface* configuration, + GpsL1CaPcpsOpenClAcquisition(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -143,30 +143,34 @@ public: } private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + const ConfigurationInterface* configuration_; pcps_opencl_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> code_; + Gnss_Synchro* gnss_synchro_; + std::string item_type_; + std::string dump_filename_; + std::string role_; + + int64_t fs_in_; + size_t item_size_; + + float threshold_; + unsigned int vector_length_; unsigned int code_length_; - bool bit_transition_flag_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool bit_transition_flag_; + bool dump_; }; #endif // GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H 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 27a7dcf2f..4d82acfff 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 @@ -37,7 +37,7 @@ namespace own = gsl; #endif GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 1d759c124..5a845ac14 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 @@ -40,7 +40,8 @@ class ConfigurationInterface; class GpsL1CaPcpsQuickSyncAcquisition : public AcquisitionInterface { public: - GpsL1CaPcpsQuickSyncAcquisition(ConfigurationInterface* configuration, + GpsL1CaPcpsQuickSyncAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -143,31 +144,35 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + + const ConfigurationInterface* configuration_; pcps_quicksync_acquisition_cc_sptr acquisition_cc_; + std::weak_ptr channel_fsm_; + gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::vector> code_; std::string item_type_; + std::string dump_filename_; + std::string role_; + + Gnss_Synchro* gnss_synchro_; + + int64_t fs_in_; + size_t item_size_; + float threshold_; unsigned int vector_length_; unsigned int code_length_; - bool bit_transition_flag_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int max_dwells_; unsigned int folding_factor_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool bit_transition_flag_; + bool dump_; }; #endif // GNSS_SDR_GPS_L1_CA_PCPS_QUICKSYNC_ACQUISITION_H 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 27e01387a..039364eb6 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 @@ -36,7 +36,7 @@ namespace own = gsl; #endif GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), 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 76a79b5a6..09f09b115 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 @@ -39,7 +39,7 @@ class ConfigurationInterface; class GpsL1CaPcpsTongAcquisition : public AcquisitionInterface { public: - GpsL1CaPcpsTongAcquisition(ConfigurationInterface* configuration, + GpsL1CaPcpsTongAcquisition(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -142,31 +142,32 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; private: - ConfigurationInterface* configuration_; + float calculate_threshold(float pfa); + + const ConfigurationInterface* configuration_; pcps_tong_acquisition_cc_sptr acquisition_cc_; gr::blocks::stream_to_vector::sptr stream_to_vector_; - size_t item_size_; + std::weak_ptr channel_fsm_; + std::vector> code_; + Gnss_Synchro* gnss_synchro_; std::string item_type_; + std::string dump_filename_; + std::string role_; + int64_t fs_in_; + size_t item_size_; + float threshold_; unsigned int vector_length_; unsigned int code_length_; unsigned int channel_; - std::weak_ptr channel_fsm_; - float threshold_; unsigned int doppler_max_; unsigned int doppler_step_; unsigned int sampled_ms_; unsigned int tong_init_val_; unsigned int tong_max_val_; unsigned int tong_max_dwells_; - int64_t fs_in_; - bool dump_; - std::string dump_filename_; - std::vector> code_; - Gnss_Synchro* gnss_synchro_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; - float calculate_threshold(float pfa); + bool dump_; }; #endif // GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H 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 d5e61e8be..c2eb579c2 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -38,16 +38,15 @@ namespace own = gsl; #endif GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 20; - acq_parameters_.SetFromConfiguration(configuration_, role, GPS_L2_M_CODE_RATE_CPS, GPS_L2C_OPT_ACQ_FS_SPS); + acq_parameters_.SetFromConfiguration(configuration, role, GPS_L2_M_CODE_RATE_CPS, GPS_L2C_OPT_ACQ_FS_SPS); DLOG(INFO) << "Role " << role; 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 6bf47245c..662f87cea 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -42,7 +42,8 @@ class ConfigurationInterface; class GpsL2MPcpsAcquisition : public AcquisitionInterface { public: - GpsL2MPcpsAcquisition(ConfigurationInterface* configuration, + GpsL2MPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -159,7 +160,6 @@ private: complex_byte_to_float_x2_sptr cbyte_to_float_x2_; std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 56dffc3d3..26e9d902a 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,7 @@ #include // for complex GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), @@ -45,16 +45,15 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( out_streams_(out_streams) { pcpsconf_fpga_t acq_parameters; - configuration_ = configuration; std::string default_dump_filename = "./acquisition.mat"; LOG(INFO) << "role " << role; - int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); - fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); + fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); acq_parameters.fs_in = fs_in_; - acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false); DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; doppler_max_ = configuration->property(role + ".doppler_max", 5000); @@ -69,15 +68,15 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( // The FPGA can only use FFT lengths that are a power of two. float nbits = ceilf(log2f(static_cast(code_length))); unsigned int nsamples_total = pow(2, nbits); - unsigned int select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 0); + unsigned int select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 0); acq_parameters.select_queue_Fpga = select_queue_Fpga; std::string default_device_name = "/dev/uio0"; - std::string device_name = configuration_->property(role + ".devicename", default_device_name); + std::string device_name = configuration->property(role + ".devicename", default_device_name); acq_parameters.device_name = device_name; acq_parameters.samples_per_code = nsamples_total; - acq_parameters.downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0); - acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14); + acq_parameters.downsampling_factor = configuration->property(role + ".downsampling_factor", 1.0); + acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 14); acq_parameters.excludelimit = static_cast(std::round(static_cast(fs_in_) / GPS_L2_M_CODE_RATE_CPS)); // compute all the GPS L2C PRN Codes (this is done only once upon the class constructor in order to avoid re-computing the PRN codes every time 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 fb5e1bc44..475326334 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 @@ -41,7 +41,8 @@ class ConfigurationInterface; class GpsL2MPcpsAcquisitionFpga : public AcquisitionInterface { public: - GpsL2MPcpsAcquisitionFpga(ConfigurationInterface* configuration, + GpsL2MPcpsAcquisitionFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -155,7 +156,6 @@ private: std::vector d_all_fft_codes_; // memory that contains all the code ffts std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; std::string item_type_; std::string dump_filename_; std::string role_; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index cfbb0f685..dd46990f5 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -37,16 +37,15 @@ namespace own = gsl; #endif GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - configuration_ = configuration; acq_parameters_.ms_per_code = 1; - acq_parameters_.SetFromConfiguration(configuration_, role, GPS_L5I_CODE_RATE_CPS, GPS_L5_OPT_ACQ_FS_SPS); + acq_parameters_.SetFromConfiguration(configuration, role, GPS_L5I_CODE_RATE_CPS, GPS_L5_OPT_ACQ_FS_SPS); DLOG(INFO) << "role " << role; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 32dc15551..41f833ad5 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -42,7 +42,8 @@ class ConfigurationInterface; class GpsL5iPcpsAcquisition : public AcquisitionInterface { public: - GpsL5iPcpsAcquisition(ConfigurationInterface* configuration, + GpsL5iPcpsAcquisition( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -159,7 +160,6 @@ private: complex_byte_to_float_x2_sptr cbyte_to_float_x2_; std::weak_ptr channel_fsm_; Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; Acq_Conf acq_parameters_; std::string item_type_; std::string dump_filename_; 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 4b0a25216..d47b10e9c 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,7 @@ #include // for complex GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), @@ -45,18 +45,17 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( out_streams_(out_streams) { pcpsconf_fpga_t acq_parameters; - configuration_ = configuration; std::string default_dump_filename = "./data/acquisition.dat"; LOG(INFO) << "role " << role; - int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); - int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); + int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); + int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false); + acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false); DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite; - uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 1); + uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 1); acq_parameters.downsampling_factor = downsampling_factor; fs_in = fs_in / downsampling_factor; @@ -75,10 +74,10 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( // The FPGA can only use FFT lengths that are a power of two. float nbits = ceilf(log2f(static_cast(code_length) * 2.0)); uint32_t nsamples_total = pow(2, nbits); - uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 1); + uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 1); acq_parameters.select_queue_Fpga = select_queue_Fpga; std::string default_device_name = "/dev/uio0"; - std::string device_name = configuration_->property(role + ".devicename", default_device_name); + std::string device_name = configuration->property(role + ".devicename", default_device_name); acq_parameters.device_name = device_name; acq_parameters.samples_per_code = nsamples_total; @@ -142,12 +141,12 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( acq_parameters.all_fft_codes = d_all_fft_codes_.data(); // reference for the FPGA FFT-IFFT attenuation factor - acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 13); + acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 13); - acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4); - acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0); - acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false); - acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2); + acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4); + acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0); + acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false); + acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2); acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters); channel_ = 0; 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 36c76fca4..d899773be 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -43,7 +43,8 @@ public: /*! * \brief Constructor */ - GpsL5iPcpsAcquisitionFpga(ConfigurationInterface* configuration, + GpsL5iPcpsAcquisitionFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -194,7 +195,6 @@ private: std::weak_ptr channel_fsm_; std::vector d_all_fft_codes_; // memory that contains all the code ffts Gnss_Synchro* gnss_synchro_; - ConfigurationInterface* configuration_; std::string item_type_; std::string dump_filename_; std::string role_; diff --git a/src/algorithms/acquisition/libs/acq_conf.cc b/src/algorithms/acquisition/libs/acq_conf.cc index 3982b0dc8..54c658a4e 100644 --- a/src/algorithms/acquisition/libs/acq_conf.cc +++ b/src/algorithms/acquisition/libs/acq_conf.cc @@ -59,7 +59,7 @@ Acq_Conf::Acq_Conf() } -void Acq_Conf::SetFromConfiguration(ConfigurationInterface *configuration, +void Acq_Conf::SetFromConfiguration(const ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq) { item_type = configuration->property(role + ".item_type", item_type); diff --git a/src/algorithms/acquisition/libs/acq_conf.h b/src/algorithms/acquisition/libs/acq_conf.h index 27472a458..1f6724b31 100644 --- a/src/algorithms/acquisition/libs/acq_conf.h +++ b/src/algorithms/acquisition/libs/acq_conf.h @@ -30,7 +30,7 @@ class Acq_Conf public: Acq_Conf(); - void SetFromConfiguration(ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq); + void SetFromConfiguration(const ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq); /* PCPS Acquisition configuration */ std::string item_type; diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 8c6f9c8b6..490326ed6 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -29,7 +29,7 @@ #include // for std::move -Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, +Channel::Channel(const ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, std::shared_ptr trk, std::shared_ptr nav, const std::string& role, const std::string& implementation, Concurrent_Queue* queue) { diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 1f7680aa7..88f61cf5d 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -54,7 +54,7 @@ class Channel : public ChannelInterface { public: //! Constructor - Channel(ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, + Channel(const ConfigurationInterface* configuration, uint32_t channel, std::shared_ptr acq, std::shared_ptr trk, std::shared_ptr nav, const std::string& role, const std::string& implementation, Concurrent_Queue* queue); diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc index 6a5f67e70..6a956e7e9 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc @@ -25,7 +25,7 @@ // Constructor -ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configuration, +ArraySignalConditioner::ArraySignalConditioner(const ConfigurationInterface *configuration, std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h index dffd061fb..fe809510f 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h @@ -40,7 +40,7 @@ class ArraySignalConditioner : public GNSSBlockInterface { public: //! Constructor - ArraySignalConditioner(ConfigurationInterface *configuration, + ArraySignalConditioner(const ConfigurationInterface *configuration, std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, std::string role, std::string implementation); diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc index c5dc07c5d..7ac8e809a 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc @@ -25,7 +25,7 @@ // Constructor -SignalConditioner::SignalConditioner(ConfigurationInterface *configuration, +SignalConditioner::SignalConditioner(const ConfigurationInterface *configuration, std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index f5639c9c4..8da2ebf07 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -37,7 +37,7 @@ class SignalConditioner : public GNSSBlockInterface { public: //! Constructor - SignalConditioner(ConfigurationInterface *configuration, + SignalConditioner(const ConfigurationInterface *configuration, std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, std::string role, std::string implementation); diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc index 907a8b478..12fe34538 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -24,8 +24,8 @@ #include -ByteToShort::ByteToShort(ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) +ByteToShort::ByteToShort(const ConfigurationInterface* configuration, std::string role, + unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "byte"; std::string default_output_item_type = "short"; @@ -33,10 +33,10 @@ ByteToShort::ByteToShort(ConfigurationInterface* configuration, std::string role DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); size_t item_size = sizeof(int16_t); diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h index b59af1438..4a935e382 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h @@ -34,7 +34,7 @@ class ConfigurationInterface; class ByteToShort : public GNSSBlockInterface { public: - ByteToShort(ConfigurationInterface* configuration, + ByteToShort(const ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams); @@ -64,7 +64,6 @@ public: private: gr::blocks::char_to_short::sptr gr_char_to_short_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc index 0d26adc16..2dbb8f638 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -24,8 +24,8 @@ #include -IbyteToCbyte::IbyteToCbyte(ConfigurationInterface* configuration, const std::string& role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(role), in_streams_(in_streams), out_streams_(out_streams) +IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "byte"; std::string default_output_item_type = "lv_8sc_t"; @@ -33,10 +33,10 @@ IbyteToCbyte::IbyteToCbyte(ConfigurationInterface* configuration, const std::str DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); inverted_spectrum = configuration->property(role + ".inverted_spectrum", false); size_t item_size = sizeof(lv_8sc_t); diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h index 694b32036..2d46eae50 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h @@ -36,7 +36,7 @@ class ConfigurationInterface; class IbyteToCbyte : public GNSSBlockInterface { public: - IbyteToCbyte(ConfigurationInterface* configuration, + IbyteToCbyte(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -67,7 +67,6 @@ private: interleaved_byte_to_complex_byte_sptr ibyte_to_cbyte_; conjugate_ic_sptr conjugate_ic_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc index ab77becbd..871f20995 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -22,8 +22,8 @@ #include -IbyteToComplex::IbyteToComplex(ConfigurationInterface* configuration, const std::string& role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(role), in_streams_(in_streams), out_streams_(out_streams) +IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "byte"; std::string default_output_item_type = "gr_complex"; @@ -31,10 +31,10 @@ IbyteToComplex::IbyteToComplex(ConfigurationInterface* configuration, const std: DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); inverted_spectrum = configuration->property(role + ".inverted_spectrum", false); size_t item_size = sizeof(gr_complex); diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h index 584fec4ff..6d5bc29ac 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h @@ -35,7 +35,7 @@ class ConfigurationInterface; class IbyteToComplex : public GNSSBlockInterface { public: - IbyteToComplex(ConfigurationInterface* configuration, + IbyteToComplex(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -66,7 +66,6 @@ private: gr::blocks::interleaved_char_to_complex::sptr gr_interleaved_char_to_complex_; conjugate_cc_sptr conjugate_cc_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc index 6cf04566a..8fd267237 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -24,8 +24,8 @@ #include -IbyteToCshort::IbyteToCshort(ConfigurationInterface* configuration, const std::string& role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(role), in_streams_(in_streams), out_streams_(out_streams) +IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "byte"; std::string default_output_item_type = "cshort"; @@ -33,10 +33,10 @@ IbyteToCshort::IbyteToCshort(ConfigurationInterface* configuration, const std::s DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); inverted_spectrum = configuration->property(role + ".inverted_spectrum", false); size_t item_size = sizeof(lv_16sc_t); diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h index d6891d82c..7fb217842 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h @@ -36,7 +36,7 @@ class ConfigurationInterface; class IbyteToCshort : public GNSSBlockInterface { public: - IbyteToCshort(ConfigurationInterface* configuration, + IbyteToCshort(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -67,7 +67,6 @@ private: interleaved_byte_to_complex_short_sptr interleaved_byte_to_complex_short_; conjugate_sc_sptr conjugate_sc_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc index d4b7d5990..053512839 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -22,8 +22,8 @@ #include -IshortToComplex::IshortToComplex(ConfigurationInterface* configuration, const std::string& role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(role), in_streams_(in_streams), out_streams_(out_streams) +IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "short"; std::string default_output_item_type = "gr_complex"; @@ -31,10 +31,10 @@ IshortToComplex::IshortToComplex(ConfigurationInterface* configuration, const st DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); inverted_spectrum = configuration->property(role + ".inverted_spectrum", false); size_t item_size = sizeof(gr_complex); diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h index 39b4317ad..9c2c4de80 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h @@ -35,7 +35,7 @@ class ConfigurationInterface; class IshortToComplex : public GNSSBlockInterface { public: - IshortToComplex(ConfigurationInterface* configuration, + IshortToComplex(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -66,7 +66,6 @@ private: gr::blocks::interleaved_short_to_complex::sptr gr_interleaved_short_to_complex_; conjugate_cc_sptr conjugate_cc_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc index 6c9a2482a..67ce39bb3 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -24,8 +24,8 @@ #include -IshortToCshort::IshortToCshort(ConfigurationInterface* configuration, const std::string& role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(role), in_streams_(in_streams), out_streams_(out_streams) +IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, const std::string& role, + unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "short"; std::string default_output_item_type = "cshort"; @@ -33,10 +33,10 @@ IshortToCshort::IshortToCshort(ConfigurationInterface* configuration, const std: DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); inverted_spectrum = configuration->property(role + ".inverted_spectrum", false); size_t item_size = sizeof(lv_16sc_t); diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h index a9e096b1e..c56bed1b8 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h @@ -36,7 +36,7 @@ class ConfigurationInterface; class IshortToCshort : public GNSSBlockInterface { public: - IshortToCshort(ConfigurationInterface* configuration, + IshortToCshort(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); @@ -67,7 +67,6 @@ private: interleaved_short_to_complex_short_sptr interleaved_short_to_complex_short_; conjugate_sc_sptr conjugate_sc_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index 22db73342..ac0f127c6 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -25,7 +25,7 @@ BeamformerFilter::BeamformerFilter( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { std::string default_item_type = "gr_complex"; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h index a29cd09bb..36151c270 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.h +++ b/src/algorithms/input_filter/adapters/beamformer_filter.h @@ -35,7 +35,7 @@ class ConfigurationInterface; class BeamformerFilter : public GNSSBlockInterface { public: - BeamformerFilter(ConfigurationInterface* configuration, + BeamformerFilter(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream); diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index d085eebc3..e5e77bf69 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -26,9 +26,10 @@ #include -FirFilter::FirFilter(ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) +FirFilter::FirFilter(const ConfigurationInterface* configuration, std::string role, + unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) { + config_ = configuration; (*this).init(); if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) { diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h index 8361d7839..445b9034a 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.h +++ b/src/algorithms/input_filter/adapters/fir_filter.h @@ -56,7 +56,7 @@ class FirFilter : public GNSSBlockInterface { public: //! Constructor - FirFilter(ConfigurationInterface* configuration, + FirFilter(const ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams); @@ -101,7 +101,7 @@ private: gr::blocks::float_to_char::sptr float_to_char_1_; gr::blocks::float_to_char::sptr float_to_char_2_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; + const ConfigurationInterface* config_; std::vector taps_; std::string dump_filename_; std::string input_item_type_; diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index b743610bf..aa7dc09ea 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -28,8 +28,8 @@ #include -FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) +FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configuration, std::string role, + unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) { std::string default_input_item_type = "gr_complex"; std::string default_output_item_type = "gr_complex"; @@ -48,17 +48,17 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); - output_item_type_ = config_->property(role_ + ".output_item_type", default_output_item_type); - taps_item_type_ = config_->property(role_ + ".taps_item_type", default_taps_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); - intermediate_freq_ = config_->property(role_ + ".IF", default_intermediate_freq); - sampling_freq_ = config_->property(role_ + ".sampling_frequency", default_sampling_freq); - int number_of_taps = config_->property(role_ + ".number_of_taps", default_number_of_taps); - unsigned int number_of_bands = config_->property(role_ + ".number_of_bands", default_number_of_bands); - std::string filter_type = config_->property(role_ + ".filter_type", default_filter_type); - decimation_factor_ = config_->property(role_ + ".decimation_factor", default_decimation_factor); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + output_item_type_ = configuration->property(role_ + ".output_item_type", default_output_item_type); + taps_item_type_ = configuration->property(role_ + ".taps_item_type", default_taps_item_type); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); + intermediate_freq_ = configuration->property(role_ + ".IF", default_intermediate_freq); + sampling_freq_ = configuration->property(role_ + ".sampling_frequency", default_sampling_freq); + int number_of_taps = configuration->property(role_ + ".number_of_taps", default_number_of_taps); + unsigned int number_of_bands = configuration->property(role_ + ".number_of_bands", default_number_of_bands); + std::string filter_type = configuration->property(role_ + ".filter_type", default_filter_type); + decimation_factor_ = configuration->property(role_ + ".decimation_factor", default_decimation_factor); if (filter_type != "lowpass") { @@ -72,27 +72,27 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration for (unsigned int i = 0; i < number_of_bands; i++) { option = ".band" + std::to_string(i + 1) + "_begin"; - option_value = config_->property(role_ + option, default_bands[i]); + option_value = configuration->property(role_ + option, default_bands[i]); bands.push_back(option_value); option = ".band" + std::to_string(i + 1) + "_end"; - option_value = config_->property(role_ + option, default_bands[i]); + option_value = configuration->property(role_ + option, default_bands[i]); bands.push_back(option_value); option = ".ampl" + std::to_string(i + 1) + "_begin"; - option_value = config_->property(role_ + option, default_bands[i]); + option_value = configuration->property(role_ + option, default_bands[i]); ampl.push_back(option_value); option = ".ampl" + std::to_string(i + 1) + "_end"; - option_value = config_->property(role_ + option, default_bands[i]); + option_value = configuration->property(role_ + option, default_bands[i]); ampl.push_back(option_value); option = ".band" + std::to_string(i + 1) + "_error"; - option_value = config_->property(role_ + option, default_bands[i]); + option_value = configuration->property(role_ + option, default_bands[i]); error_w.push_back(option_value); } - int grid_density = config_->property(role_ + ".grid_density", default_grid_density); + int grid_density = configuration->property(role_ + ".grid_density", default_grid_density); taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); taps_.reserve(taps_d.size()); for (double& it : taps_d) @@ -103,9 +103,9 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration else { double default_bw = (sampling_freq_ / decimation_factor_) / 2; - double bw_ = config_->property(role_ + ".bw", default_bw); + double bw_ = configuration->property(role_ + ".bw", default_bw); double default_tw = bw_ / 10.0; - double tw_ = config_->property(role_ + ".tw", default_tw); + double tw_ = configuration->property(role_ + ".tw", default_tw); taps_ = gr::filter::firdes::low_pass(1.0, sampling_freq_, bw_, tw_); } diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h index 33466a4ba..6de2fd473 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h @@ -56,7 +56,7 @@ class ConfigurationInterface; class FreqXlatingFirFilter : public GNSSBlockInterface { public: - FreqXlatingFirFilter(ConfigurationInterface* configuration, + FreqXlatingFirFilter(const ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams); @@ -94,7 +94,6 @@ private: short_x2_to_cshort_sptr short_x2_to_cshort_; complex_float_to_complex_byte_sptr complex_to_complex_byte_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::vector taps_; std::string dump_filename_; std::string input_item_type_; diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc index 70769eafd..7e275cf96 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.cc +++ b/src/algorithms/input_filter/adapters/notch_filter.cc @@ -25,10 +25,9 @@ #include -NotchFilter::NotchFilter(ConfigurationInterface* configuration, const std::string& role, +NotchFilter::NotchFilter(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { - size_t item_size_; float pfa; float default_pfa = 0.001; float p_c_factor; diff --git a/src/algorithms/input_filter/adapters/notch_filter.h b/src/algorithms/input_filter/adapters/notch_filter.h index 2bb38a951..18c913547 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.h +++ b/src/algorithms/input_filter/adapters/notch_filter.h @@ -33,7 +33,7 @@ class ConfigurationInterface; class NotchFilter : public GNSSBlockInterface { public: - NotchFilter(ConfigurationInterface* configuration, + NotchFilter(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc index c132fc99c..da06cf275 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc @@ -26,7 +26,7 @@ #include // for max -NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, const std::string& role, +NotchFilterLite::NotchFilterLite(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { float p_c_factor; diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.h b/src/algorithms/input_filter/adapters/notch_filter_lite.h index e93c3e51c..83ce73479 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.h +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.h @@ -33,7 +33,7 @@ class ConfigurationInterface; class NotchFilterLite : public GNSSBlockInterface { public: - NotchFilterLite(ConfigurationInterface* configuration, + NotchFilterLite(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index 06d619398..0ac990167 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -27,8 +27,8 @@ #include -PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration, std::string role, - unsigned int in_streams, unsigned int out_streams) : config_(configuration), role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) +PulseBlankingFilter::PulseBlankingFilter(const ConfigurationInterface* configuration, std::string role, + unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams) { size_t item_size; xlat_ = false; @@ -38,18 +38,18 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration, DLOG(INFO) << "role " << role_; - input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); - output_item_type_ = config_->property(role_ + ".output_item_type", default_output_item_type); - dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + output_item_type_ = configuration->property(role_ + ".output_item_type", default_output_item_type); + dump_ = configuration->property(role_ + ".dump", false); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); float default_pfa_ = 0.04; - float pfa = config_->property(role_ + ".pfa", default_pfa_); + float pfa = configuration->property(role_ + ".pfa", default_pfa_); int default_length_ = 32; - int length_ = config_->property(role_ + ".length", default_length_); + int length_ = configuration->property(role_ + ".length", default_length_); int default_n_segments_est = 12500; - int n_segments_est = config_->property(role_ + ".segments_est", default_n_segments_est); + int n_segments_est = configuration->property(role_ + ".segments_est", default_n_segments_est); int default_n_segments_reset = 5000000; - int n_segments_reset = config_->property(role_ + ".segments_reset", default_n_segments_reset); + int n_segments_reset = configuration->property(role_ + ".segments_reset", default_n_segments_reset); if (input_item_type_ == "gr_complex") { item_size = sizeof(gr_complex); // output @@ -63,17 +63,17 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration, input_size_ = sizeof(gr_complex); // avoids uninitialization } double default_if = 0.0; - double if_aux = config_->property(role_ + ".if", default_if); - double if_ = config_->property(role_ + ".IF", if_aux); + double if_aux = configuration->property(role_ + ".if", default_if); + double if_ = configuration->property(role_ + ".IF", if_aux); if (std::abs(if_) > 1.0) { xlat_ = true; double default_sampling_freq = 4000000.0; - double sampling_freq_ = config_->property(role_ + ".sampling_frequency", default_sampling_freq); + double sampling_freq_ = configuration->property(role_ + ".sampling_frequency", default_sampling_freq); double default_bw = 2000000.0; - double bw_ = config_->property(role_ + ".bw", default_bw); + double bw_ = configuration->property(role_ + ".bw", default_bw); double default_tw = bw_ / 10.0; - double tw_ = config_->property(role_ + ".tw", default_tw); + double tw_ = configuration->property(role_ + ".tw", default_tw); const std::vector taps = gr::filter::firdes::low_pass(1.0, sampling_freq_, bw_, tw_); freq_xlating_ = gr::filter::freq_xlating_fir_filter_ccf::make(1, taps, if_, sampling_freq_); } diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h index c4e25c35d..4385f29a8 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h @@ -36,7 +36,7 @@ class ConfigurationInterface; class PulseBlankingFilter : public GNSSBlockInterface { public: - PulseBlankingFilter(ConfigurationInterface* configuration, + PulseBlankingFilter(const ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams); @@ -67,7 +67,6 @@ private: pulse_blanking_cc_sptr pulse_blanking_cc_; gr::filter::freq_xlating_fir_filter_ccf::sptr freq_xlating_; gr::blocks::file_sink::sptr file_sink_; - ConfigurationInterface* config_; std::string dump_filename_; std::string input_item_type_; std::string output_item_type_; diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index b31577cdf..cd1f549c9 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -28,7 +28,7 @@ #include // for operator<< -Pass_Through::Pass_Through(ConfigurationInterface* configuration, const std::string& role, +Pass_Through::Pass_Through(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h index 51bed37f4..09c34aeee 100644 --- a/src/algorithms/libs/pass_through.h +++ b/src/algorithms/libs/pass_through.h @@ -40,7 +40,7 @@ class ConfigurationInterface; class Pass_Through : public GNSSBlockInterface { public: - Pass_Through(ConfigurationInterface* configuration, + Pass_Through(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream); diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index 25b6b37c0..dd0372b80 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -25,7 +25,7 @@ #include #include // for operator<< -HybridObservables::HybridObservables(ConfigurationInterface* configuration, +HybridObservables::HybridObservables(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_dump_filename = "./observables.dat"; diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h index 9839f0a07..050638706 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.h +++ b/src/algorithms/observables/adapters/hybrid_observables.h @@ -39,7 +39,7 @@ class ConfigurationInterface; class HybridObservables : public ObservablesInterface { public: - HybridObservables(ConfigurationInterface* configuration, + HybridObservables(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index 58db31c33..0ba2e5ab7 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -32,7 +32,7 @@ DirectResamplerConditioner::DirectResamplerConditioner( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { std::string default_item_type = "short"; diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h index bf13074f1..44dc64f22 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h @@ -35,7 +35,7 @@ class ConfigurationInterface; class DirectResamplerConditioner : public GNSSBlockInterface { public: - DirectResamplerConditioner(ConfigurationInterface* configuration, + DirectResamplerConditioner(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream); diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index 2c2f42d6d..4a302320b 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -27,7 +27,7 @@ #include MmseResamplerConditioner::MmseResamplerConditioner( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { std::string default_item_type = "gr_complex"; diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h index 1ef983090..734bba7c5 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h @@ -43,7 +43,7 @@ class ConfigurationInterface; class MmseResamplerConditioner : public GNSSBlockInterface { public: - MmseResamplerConditioner(ConfigurationInterface* configuration, + MmseResamplerConditioner(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream); diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc index 77e658144..258939a75 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.cc +++ b/src/algorithms/signal_generator/adapters/signal_generator.cc @@ -31,7 +31,7 @@ #include -SignalGenerator::SignalGenerator(ConfigurationInterface* configuration, +SignalGenerator::SignalGenerator(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue __attribute__((unused))) : role_(role), in_stream_(in_stream), out_stream_(out_stream) diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h index 4e97b07d1..0a45f7f8a 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.h +++ b/src/algorithms/signal_generator/adapters/signal_generator.h @@ -42,7 +42,7 @@ class ConfigurationInterface; class SignalGenerator : public GNSSBlockInterface { public: - SignalGenerator(ConfigurationInterface* configuration, + SignalGenerator(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc index 557e3a670..01a71bf80 100644 --- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc +++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc @@ -41,7 +41,7 @@ #include -Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface *configuration, +Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *configuration, const std::string &role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue *queue __attribute__((unused))) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h index 2e7bd57e9..003a88ce1 100644 --- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h +++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h @@ -35,7 +35,7 @@ class ConfigurationInterface; class Ad9361FpgaSignalSource : public GNSSBlockInterface { public: - Ad9361FpgaSignalSource(ConfigurationInterface *configuration, + Ad9361FpgaSignalSource(const ConfigurationInterface *configuration, const std::string &role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue *queue); diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc index c0e2d0479..6a735862d 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc @@ -27,7 +27,7 @@ #include -CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configuration, +CustomUDPSignalSource::CustomUDPSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue __attribute__((unused))) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h index 29df7a703..9f0b354a7 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h @@ -46,7 +46,7 @@ class ConfigurationInterface; class CustomUDPSignalSource : public GNSSBlockInterface { public: - CustomUDPSignalSource(ConfigurationInterface* configuration, + CustomUDPSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index b5f347744..c6b2c2853 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -31,7 +31,7 @@ #include -FileSignalSource::FileSignalSource(ConfigurationInterface* configuration, +FileSignalSource::FileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index 07c0e34b4..629e9837f 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -48,7 +48,7 @@ class ConfigurationInterface; class FileSignalSource : public GNSSBlockInterface { public: - FileSignalSource(ConfigurationInterface* configuration, const std::string& role, + FileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc index 95af50c4d..3ac912fb9 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc @@ -27,7 +27,7 @@ #include -FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configuration, +FlexibandSignalSource::FlexibandSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h index f0d1d5239..4f00e9b55 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h @@ -45,7 +45,7 @@ class ConfigurationInterface; class FlexibandSignalSource : public GNSSBlockInterface { public: - FlexibandSignalSource(ConfigurationInterface* configuration, + FlexibandSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc index f1f96f3fc..985264875 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc @@ -32,7 +32,7 @@ #include -Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface *configuration, +Fmcomms2SignalSource::Fmcomms2SignalSource(const ConfigurationInterface *configuration, const std::string &role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue *queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h index dafe00b32..1bc0fa37c 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h @@ -44,7 +44,7 @@ class ConfigurationInterface; class Fmcomms2SignalSource : public GNSSBlockInterface { public: - Fmcomms2SignalSource(ConfigurationInterface* configuration, + Fmcomms2SignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc index 824429655..4876fe661 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc @@ -24,7 +24,7 @@ #include -Gn3sSignalSource::Gn3sSignalSource(ConfigurationInterface* configuration, +Gn3sSignalSource::Gn3sSignalSource(const ConfigurationInterface* configuration, std::string role, unsigned int in_stream, unsigned int out_stream, diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index 7635f9077..f922c125d 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -39,7 +39,7 @@ class ConfigurationInterface; class Gn3sSignalSource : public GNSSBlockInterface { public: - Gn3sSignalSource(ConfigurationInterface* configuration, + Gn3sSignalSource(const ConfigurationInterface* configuration, std::string role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc index fa828795b..e27b98857 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc @@ -25,7 +25,7 @@ #include -LabsatSignalSource::LabsatSignalSource(ConfigurationInterface* configuration, +LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { std::string default_item_type = "gr_complex"; diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h index a52dbf16c..4e1a0a34b 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.h +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h @@ -37,7 +37,7 @@ class ConfigurationInterface; class LabsatSignalSource : public GNSSBlockInterface { public: - LabsatSignalSource(ConfigurationInterface* configuration, + LabsatSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc index 22ce5e3cb..153f0e752 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc @@ -30,7 +30,7 @@ #include -MultichannelFileSignalSource::MultichannelFileSignalSource(ConfigurationInterface* configuration, +MultichannelFileSignalSource::MultichannelFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h index e156cdb25..a84a1b078 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h @@ -49,7 +49,7 @@ class ConfigurationInterface; class MultichannelFileSignalSource : public GNSSBlockInterface { public: - MultichannelFileSignalSource(ConfigurationInterface* configuration, const std::string& role, + MultichannelFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc index b365c0d20..b73dd3685 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -31,7 +31,7 @@ #include -NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration, +NsrFileSignalSource::NsrFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h index 63841b2fe..dff5c293c 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -48,7 +48,7 @@ class ConfigurationInterface; class NsrFileSignalSource : public GNSSBlockInterface { public: - NsrFileSignalSource(ConfigurationInterface* configuration, const std::string& role, + NsrFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc index 14c056489..75ac8504a 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc @@ -29,7 +29,7 @@ #include -OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration, +OsmosdrSignalSource::OsmosdrSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h index 771e66acf..611c28b9a 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h @@ -46,7 +46,7 @@ class ConfigurationInterface; class OsmosdrSignalSource : public GNSSBlockInterface { public: - OsmosdrSignalSource(ConfigurationInterface* configuration, + OsmosdrSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc index 161ccdff5..51cfe53e7 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc @@ -26,7 +26,7 @@ #include -PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration, +PlutosdrSignalSource::PlutosdrSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h index c537516f0..970c39a62 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h @@ -46,7 +46,7 @@ class ConfigurationInterface; class PlutosdrSignalSource : public GNSSBlockInterface { public: - PlutosdrSignalSource(ConfigurationInterface* configuration, + PlutosdrSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc index 26d64f7cb..1bd3ac1f9 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc @@ -26,7 +26,7 @@ #include -RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration, +RawArraySignalSource::RawArraySignalSource(const ConfigurationInterface* configuration, std::string role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { std::string default_item_type = "gr_complex"; diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h index 6d4fd9da5..f9e03cdeb 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h @@ -38,7 +38,7 @@ class ConfigurationInterface; class RawArraySignalSource : public GNSSBlockInterface { public: - RawArraySignalSource(ConfigurationInterface* configuration, + RawArraySignalSource(const ConfigurationInterface* configuration, std::string role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc index 8edde7ee4..a4e0f90b8 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -30,7 +30,7 @@ #include -RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration, +RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h index 2daa4d1c4..5b145663b 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h @@ -47,7 +47,7 @@ class ConfigurationInterface; class RtlTcpSignalSource : public GNSSBlockInterface { public: - RtlTcpSignalSource(ConfigurationInterface* configuration, + RtlTcpSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc index a14bab6ad..f27e2c476 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -30,7 +30,7 @@ #include -SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration, +SpirFileSignalSource::SpirFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h index d66136518..57391a2b6 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h @@ -46,11 +46,12 @@ class ConfigurationInterface; class SpirFileSignalSource : public GNSSBlockInterface { public: - SpirFileSignalSource(ConfigurationInterface* configuration, const std::string& role, + SpirFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue); ~SpirFileSignalSource() = default; + inline std::string role() override { return role_; diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc index 76ba6a20e..ea0fc86a3 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc @@ -28,7 +28,7 @@ #include -SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(ConfigurationInterface* configuration, +SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInterface* configuration, const std::string& role, uint32_t in_streams, uint32_t out_streams, Concurrent_Queue* queue) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { std::string default_filename = "../data/my_capture.dat"; diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h index 20644af39..663bbb20f 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h @@ -52,7 +52,7 @@ class ConfigurationInterface; class SpirGSS6450FileSignalSource : public GNSSBlockInterface { public: - SpirGSS6450FileSignalSource(ConfigurationInterface* configuration, const std::string& role, + SpirGSS6450FileSignalSource(const ConfigurationInterface* configuration, const std::string& role, uint32_t in_streams, uint32_t out_streams, Concurrent_Queue* queue); ~SpirGSS6450FileSignalSource() = default; diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc index 93c4c196a..baf07c578 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc @@ -30,7 +30,8 @@ #include -TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* configuration, +TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h index e0cb939ed..9111ac8f8 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h @@ -50,7 +50,7 @@ class ConfigurationInterface; class TwoBitCpxFileSignalSource : public GNSSBlockInterface { public: - TwoBitCpxFileSignalSource(ConfigurationInterface* configuration, + TwoBitCpxFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc index cb4032487..bf2d9cb09 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc @@ -32,7 +32,8 @@ #include -TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterface* configuration, +TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h index 67e46ad9f..1672ec6e8 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h @@ -51,7 +51,7 @@ class ConfigurationInterface; class TwoBitPackedFileSignalSource : public GNSSBlockInterface { public: - TwoBitPackedFileSignalSource(ConfigurationInterface* configuration, const std::string& role, + TwoBitPackedFileSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue); diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc index ea6b30150..758b4c71d 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc @@ -29,7 +29,7 @@ #include -UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration, +UhdSignalSource::UhdSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream) { diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index 876ada0f2..719ebc6c6 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -44,7 +44,7 @@ class ConfigurationInterface; class UhdSignalSource : public GNSSBlockInterface { public: - UhdSignalSource(ConfigurationInterface* configuration, + UhdSignalSource(const ConfigurationInterface* configuration, const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue* queue); diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc index a6c2b58c8..321d86eeb 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc @@ -24,7 +24,8 @@ #include -BeidouB1iTelemetryDecoder::BeidouB1iTelemetryDecoder(ConfigurationInterface* configuration, +BeidouB1iTelemetryDecoder::BeidouB1iTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h index 23aeae9d8..c330fa9d2 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h @@ -39,7 +39,8 @@ class ConfigurationInterface; class BeidouB1iTelemetryDecoder : public TelemetryDecoderInterface { public: - BeidouB1iTelemetryDecoder(ConfigurationInterface* configuration, + BeidouB1iTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc index 3f24603db..21e0b9d8f 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc @@ -23,7 +23,7 @@ #include BeidouB3iTelemetryDecoder::BeidouB3iTelemetryDecoder( - ConfigurationInterface *configuration, const std::string &role, + const ConfigurationInterface *configuration, const std::string &role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h index 33c33bebf..4a2329cd8 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h @@ -37,7 +37,8 @@ class ConfigurationInterface; class BeidouB3iTelemetryDecoder : public TelemetryDecoderInterface { public: - BeidouB3iTelemetryDecoder(ConfigurationInterface *configuration, + BeidouB3iTelemetryDecoder( + const ConfigurationInterface *configuration, const std::string &role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc index 3d4aefb9c..8347077c9 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -25,7 +25,8 @@ #include -GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* configuration, +GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h index 03b5ce357..066813d90 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -41,7 +41,8 @@ class ConfigurationInterface; class GalileoE1BTelemetryDecoder : public TelemetryDecoderInterface { public: - GalileoE1BTelemetryDecoder(ConfigurationInterface* configuration, + GalileoE1BTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc index e1a44df98..c30d3437e 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -28,7 +28,8 @@ #include -GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* configuration, +GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h index 511863b44..653688be6 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h @@ -42,7 +42,8 @@ class ConfigurationInterface; class GalileoE5aTelemetryDecoder : public TelemetryDecoderInterface { public: - GalileoE5aTelemetryDecoder(ConfigurationInterface* configuration, + GalileoE5aTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc index d67abe379..4c78c1f44 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc @@ -25,7 +25,8 @@ #include -GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface* configuration, +GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h index 9165fbd94..a9c10461c 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h @@ -39,7 +39,8 @@ class ConfigurationInterface; class GlonassL1CaTelemetryDecoder : public TelemetryDecoderInterface { public: - GlonassL1CaTelemetryDecoder(ConfigurationInterface* configuration, + GlonassL1CaTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc index 32fc8f053..ec6a4d0a7 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc @@ -24,7 +24,8 @@ #include -GlonassL2CaTelemetryDecoder::GlonassL2CaTelemetryDecoder(ConfigurationInterface* configuration, +GlonassL2CaTelemetryDecoder::GlonassL2CaTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h index ea318eab3..8d5cf23ab 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class GlonassL2CaTelemetryDecoder : public TelemetryDecoderInterface { public: - GlonassL2CaTelemetryDecoder(ConfigurationInterface* configuration, + GlonassL2CaTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc index 2f213ecc1..7b6d21fb3 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc @@ -24,7 +24,8 @@ #include -GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configuration, +GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index 047012ab1..6df106d84 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class GpsL1CaTelemetryDecoder : public TelemetryDecoderInterface { public: - GpsL1CaTelemetryDecoder(ConfigurationInterface* configuration, + GpsL1CaTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc index b3c877089..1f716d574 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -24,7 +24,8 @@ #include -GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configuration, +GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h index 7dd549cc4..08acecbda 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class GpsL2CTelemetryDecoder : public TelemetryDecoderInterface { public: - GpsL2CTelemetryDecoder(ConfigurationInterface* configuration, + GpsL2CTelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc index 68ad14ab0..76fa4eed9 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc @@ -24,7 +24,8 @@ #include -GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configuration, +GpsL5TelemetryDecoder::GpsL5TelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h index 8d7d4c433..a004cf89a 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h @@ -40,7 +40,8 @@ class ConfigurationInterface; class GpsL5TelemetryDecoder : public TelemetryDecoderInterface { public: - GpsL5TelemetryDecoder(ConfigurationInterface* configuration, + GpsL5TelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 50e87b951..1f11aa66d 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -24,7 +24,8 @@ #include -SbasL1TelemetryDecoder::SbasL1TelemetryDecoder(ConfigurationInterface* configuration, +SbasL1TelemetryDecoder::SbasL1TelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index 45e383f3a..9259a5d5e 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -40,7 +40,8 @@ class ConfigurationInterface; class SbasL1TelemetryDecoder : public TelemetryDecoderInterface { public: - SbasL1TelemetryDecoder(ConfigurationInterface* configuration, + SbasL1TelemetryDecoder( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc index f59bd49e1..fd36fea11 100644 --- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc @@ -34,7 +34,7 @@ BeidouB1iDllPllTracking::BeidouB1iDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h index 7113cae2a..b1ea15cf0 100644 --- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class BeidouB1iDllPllTracking : public TrackingInterface { public: - BeidouB1iDllPllTracking(ConfigurationInterface* configuration, + BeidouB1iDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc index fcbd78590..74e875c4d 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc @@ -35,7 +35,7 @@ using google::LogMessage; BeidouB3iDllPllTracking::BeidouB3iDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h index c500cf275..d54802f9c 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class BeidouB3iDllPllTracking : public TrackingInterface { public: - BeidouB3iDllPllTracking(ConfigurationInterface* configuration, + BeidouB3iDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc index be318f970..e711d5cb0 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc @@ -33,7 +33,7 @@ #include GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h index 83a8359ad..21d7e1107 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h @@ -40,7 +40,8 @@ class ConfigurationInterface; class GalileoE1DllPllVemlTracking : public TrackingInterface { public: - GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration, + GalileoE1DllPllVemlTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc index bb5ca1837..7aa6c6a34 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc @@ -35,7 +35,7 @@ #include GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf_Fpga trk_params_fpga = Dll_Pll_Conf_Fpga(); diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h index 7fc2b787e..22bc52643 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.h @@ -43,7 +43,8 @@ public: /*! * \brief Constructor */ - GalileoE1DllPllVemlTrackingFpga(ConfigurationInterface* configuration, + GalileoE1DllPllVemlTrackingFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc index 824bf3687..4e30253de 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc @@ -33,7 +33,7 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h index 0bb9d1e76..3ad5b50d6 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h @@ -41,7 +41,8 @@ class ConfigurationInterface; class GalileoE1TcpConnectorTracking : public TrackingInterface { public: - GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration, + GalileoE1TcpConnectorTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc index e9ef9c6ad..824736fd5 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc @@ -32,7 +32,7 @@ #include GalileoE5aDllPllTracking::GalileoE5aDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h index 31a9bb0a3..200029734 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class GalileoE5aDllPllTracking : public TrackingInterface { public: - GalileoE5aDllPllTracking(ConfigurationInterface* configuration, + GalileoE5aDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc index 422df5487..fe5dc29c0 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc @@ -30,7 +30,7 @@ #include GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga( - ConfigurationInterface *configuration, const std::string &role, + const ConfigurationInterface *configuration, const std::string &role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf_Fpga trk_params_fpga = Dll_Pll_Conf_Fpga(); diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h index 9a014b8b9..b1e803bf5 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.h @@ -36,7 +36,8 @@ public: /*! * \brief Constructor */ - GalileoE5aDllPllTrackingFpga(ConfigurationInterface* configuration, + GalileoE5aDllPllTrackingFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc index cec657282..1fdb27c5f 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc @@ -34,7 +34,7 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h index 85c175d67..d7a597706 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h @@ -42,7 +42,8 @@ class ConfigurationInterface; class GlonassL1CaDllPllCAidTracking : public TrackingInterface { public: - GlonassL1CaDllPllCAidTracking(ConfigurationInterface* configuration, + GlonassL1CaDllPllCAidTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc index 3f50dae0c..09be39990 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc @@ -33,7 +33,7 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h index c39b93c42..5868547ea 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h @@ -40,7 +40,8 @@ class ConfigurationInterface; class GlonassL1CaDllPllTracking : public TrackingInterface { public: - GlonassL1CaDllPllTracking(ConfigurationInterface* configuration, + GlonassL1CaDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc index f95473025..2ad8e0378 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc @@ -32,7 +32,7 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h index 823feeada..e3937f46f 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h @@ -40,7 +40,8 @@ class ConfigurationInterface; class GlonassL2CaDllPllCAidTracking : public TrackingInterface { public: - GlonassL2CaDllPllCAidTracking(ConfigurationInterface* configuration, + GlonassL2CaDllPllCAidTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc index c8d0b53fd..130ce2204 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc @@ -31,7 +31,7 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h index d0bc07da9..5e4d2ec75 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h @@ -39,7 +39,8 @@ class ConfigurationInterface; class GlonassL2CaDllPllTracking : public TrackingInterface { public: - GlonassL2CaDllPllTracking(ConfigurationInterface* configuration, + GlonassL2CaDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc index ebc27d500..ec249279d 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc @@ -34,7 +34,7 @@ #include GpsL1CaDllPllTracking::GpsL1CaDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h index 794095472..75f86c72f 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h @@ -39,7 +39,8 @@ class ConfigurationInterface; class GpsL1CaDllPllTracking : public TrackingInterface { public: - GpsL1CaDllPllTracking(ConfigurationInterface* configuration, + GpsL1CaDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc index 040c85b96..8a1dad004 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.cc @@ -35,7 +35,7 @@ #include GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf_Fpga trk_params_fpga = Dll_Pll_Conf_Fpga(); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h index 49d8de541..9f869c1fb 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_fpga.h @@ -41,7 +41,8 @@ public: /*! * \brief Constructor */ - GpsL1CaDllPllTrackingFpga(ConfigurationInterface* configuration, + GpsL1CaDllPllTrackingFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc index 94179082e..9723f2d3f 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc @@ -32,7 +32,7 @@ GpsL1CaDllPllTrackingGPU::GpsL1CaDllPllTrackingGPU( - ConfigurationInterface* configuration, std::string role, + const ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h index be91bf8f9..41552d43e 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h @@ -39,7 +39,8 @@ class ConfigurationInterface; class GpsL1CaDllPllTrackingGPU : public TrackingInterface { public: - GpsL1CaDllPllTrackingGPU(ConfigurationInterface* configuration, + GpsL1CaDllPllTrackingGPU( + const ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc index d832d4844..e78751b2c 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc @@ -35,7 +35,7 @@ GpsL1CaKfTracking::GpsL1CaKfTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h index 09fb07366..156fc8c59 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h @@ -41,7 +41,8 @@ class ConfigurationInterface; class GpsL1CaKfTracking : public TrackingInterface { public: - GpsL1CaKfTracking(ConfigurationInterface* configuration, + GpsL1CaKfTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc index 0974c9882..abf25c1ea 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc @@ -32,7 +32,7 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { DLOG(INFO) << "role " << role; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h index d050f20de..6fed16da6 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h @@ -40,7 +40,8 @@ class ConfigurationInterface; class GpsL1CaTcpConnectorTracking : public TrackingInterface { public: - GpsL1CaTcpConnectorTracking(ConfigurationInterface* configuration, + GpsL1CaTcpConnectorTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc index 3bcdcd4e5..18c7ab9e2 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc @@ -33,7 +33,7 @@ #include GpsL2MDllPllTracking::GpsL2MDllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h index 604914450..47b17c638 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h @@ -39,7 +39,8 @@ class ConfigurationInterface; class GpsL2MDllPllTracking : public TrackingInterface { public: - GpsL2MDllPllTracking(ConfigurationInterface* configuration, + GpsL2MDllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc index 07e398275..bab6a8ed2 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.cc @@ -40,7 +40,7 @@ #include GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf_Fpga trk_params_fpga = Dll_Pll_Conf_Fpga(); diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h index 7f2ff5f8d..eb4aa77c3 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking_fpga.h @@ -41,7 +41,8 @@ class ConfigurationInterface; class GpsL2MDllPllTrackingFpga : public TrackingInterface { public: - GpsL2MDllPllTrackingFpga(ConfigurationInterface* configuration, + GpsL2MDllPllTrackingFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc index a0eebcfa2..ca118bc9f 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc @@ -33,7 +33,7 @@ #include GpsL5DllPllTracking::GpsL5DllPllTracking( - ConfigurationInterface* configuration, const std::string& role, + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf trk_params = Dll_Pll_Conf(); diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h index 27f095238..24bad4acc 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h @@ -38,7 +38,8 @@ class ConfigurationInterface; class GpsL5DllPllTracking : public TrackingInterface { public: - GpsL5DllPllTracking(ConfigurationInterface* configuration, + GpsL5DllPllTracking( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc index d0d2a2996..b75ba231b 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc @@ -37,7 +37,7 @@ #include GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga( - ConfigurationInterface *configuration, const std::string &role, + const ConfigurationInterface *configuration, const std::string &role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { Dll_Pll_Conf_Fpga trk_params_fpga = Dll_Pll_Conf_Fpga(); diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h index c429375dd..2b0305ade 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.h @@ -42,7 +42,8 @@ public: /*! * \brief Constructor */ - GpsL5DllPllTrackingFpga(ConfigurationInterface* configuration, + GpsL5DllPllTrackingFpga( + const ConfigurationInterface* configuration, const std::string& role, unsigned int in_streams, unsigned int out_streams); diff --git a/src/algorithms/tracking/libs/dll_pll_conf.cc b/src/algorithms/tracking/libs/dll_pll_conf.cc index 4c8061cd7..e35b7d999 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf.cc +++ b/src/algorithms/tracking/libs/dll_pll_conf.cc @@ -76,7 +76,7 @@ Dll_Pll_Conf::Dll_Pll_Conf() } -void Dll_Pll_Conf::SetFromConfiguration(ConfigurationInterface *configuration, +void Dll_Pll_Conf::SetFromConfiguration(const ConfigurationInterface *configuration, const std::string &role) { item_type = configuration->property(role + ".item_type", item_type); diff --git a/src/algorithms/tracking/libs/dll_pll_conf.h b/src/algorithms/tracking/libs/dll_pll_conf.h index 769906a6c..35a47a301 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf.h +++ b/src/algorithms/tracking/libs/dll_pll_conf.h @@ -30,7 +30,7 @@ class Dll_Pll_Conf { public: Dll_Pll_Conf(); - void SetFromConfiguration(ConfigurationInterface *configuration, const std::string &role); + void SetFromConfiguration(const ConfigurationInterface *configuration, const std::string &role); /* DLL/PLL tracking configuration */ std::string item_type; diff --git a/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc b/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc index cafe62f45..90d0e4305 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc +++ b/src/algorithms/tracking/libs/dll_pll_conf_fpga.cc @@ -87,7 +87,7 @@ Dll_Pll_Conf_Fpga::Dll_Pll_Conf_Fpga() } -void Dll_Pll_Conf_Fpga::SetFromConfiguration(ConfigurationInterface *configuration, +void Dll_Pll_Conf_Fpga::SetFromConfiguration(const ConfigurationInterface *configuration, const std::string &role) { int32_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", fs_in); diff --git a/src/algorithms/tracking/libs/dll_pll_conf_fpga.h b/src/algorithms/tracking/libs/dll_pll_conf_fpga.h index e014ef697..1f09a49e5 100644 --- a/src/algorithms/tracking/libs/dll_pll_conf_fpga.h +++ b/src/algorithms/tracking/libs/dll_pll_conf_fpga.h @@ -32,7 +32,7 @@ class Dll_Pll_Conf_Fpga { public: Dll_Pll_Conf_Fpga(); - void SetFromConfiguration(ConfigurationInterface* configuration, const std::string& role); + void SetFromConfiguration(const ConfigurationInterface* configuration, const std::string& role); /* DLL/PLL tracking configuration */ std::string device_name; diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 136716f8f..e891c1e13 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -168,7 +168,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalSource( - ConfigurationInterface* configuration, Concurrent_Queue* queue, int ID) // NOLINT(performance-unnecessary-value-param) + const ConfigurationInterface* configuration, Concurrent_Queue* queue, int ID) // NOLINT(performance-unnecessary-value-param) { std::string default_implementation = "File_Signal_Source"; std::string role = "SignalSource"; // backwards compatibility for old conf files @@ -190,7 +190,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalSource( std::unique_ptr GNSSBlockFactory::GetSignalConditioner( - ConfigurationInterface* configuration, int ID) + const ConfigurationInterface* configuration, int ID) { std::string default_implementation = "Pass_Through"; // backwards compatibility for old conf files @@ -256,7 +256,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( } -std::unique_ptr GNSSBlockFactory::GetObservables(ConfigurationInterface* configuration) +std::unique_ptr GNSSBlockFactory::GetObservables(const ConfigurationInterface* configuration) { std::string default_implementation = "Hybrid_Observables"; std::string implementation = configuration->property("Observables.implementation", default_implementation); @@ -284,7 +284,7 @@ std::unique_ptr GNSSBlockFactory::GetObservables(Configurati } -std::unique_ptr GNSSBlockFactory::GetPVT(ConfigurationInterface* configuration) +std::unique_ptr GNSSBlockFactory::GetPVT(const ConfigurationInterface* configuration) { std::string default_implementation = "RTKLIB_PVT"; std::string implementation = configuration->property("PVT.implementation", default_implementation); @@ -305,7 +305,7 @@ std::unique_ptr GNSSBlockFactory::GetPVT(ConfigurationInterf // ********* GPS L1 C/A CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_1C( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -370,7 +370,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1C( // ********* GPS L2C (M) CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_2S( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -431,7 +431,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2S( // ********* GALILEO E1 B CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_1B( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -495,7 +495,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1B( // ********* GALILEO E5a CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_5X( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -559,7 +559,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5X( // ********* GLONASS L1 C/A CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_1G( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -624,7 +624,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1G( // ********* GLONASS L2 C/A CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_2G( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -689,7 +689,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2G( // ********* GPS L5 CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_L5( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -753,7 +753,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_L5( // ********* BeiDou B1I CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_B1( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -817,7 +817,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B1( // ********* BeiDou B3I CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_B3( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue) { @@ -880,7 +880,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B3( std::unique_ptr>> GNSSBlockFactory::GetChannels( - ConfigurationInterface* configuration, Concurrent_Queue* queue) // NOLINT(performance-unnecessary-value-param) + const ConfigurationInterface* configuration, Concurrent_Queue* queue) // NOLINT(performance-unnecessary-value-param) { std::string default_implementation = "Pass_Through"; std::string tracking_implementation; @@ -1197,7 +1197,7 @@ std::unique_ptr>> GNSSBlockFacto * (see below) */ std::unique_ptr GNSSBlockFactory::GetBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue) // NOLINT(performance-unnecessary-value-param) @@ -1913,7 +1913,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( */ std::unique_ptr GNSSBlockFactory::GetAcqBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams) @@ -2089,7 +2089,7 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( std::unique_ptr GNSSBlockFactory::GetTrkBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams) @@ -2240,7 +2240,7 @@ std::unique_ptr GNSSBlockFactory::GetTrkBlock( std::unique_ptr GNSSBlockFactory::GetTlmBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams) diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index cdf89e8a2..80d146f2d 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -49,77 +49,77 @@ public: GNSSBlockFactory() = default; ~GNSSBlockFactory() = default; - std::unique_ptr GetSignalSource(ConfigurationInterface* configuration, + std::unique_ptr GetSignalSource(const ConfigurationInterface* configuration, Concurrent_Queue* queue, int ID = -1); // NOLINT(performance-unnecessary-value-param) - std::unique_ptr GetSignalConditioner(ConfigurationInterface* configuration, int ID = -1); + std::unique_ptr GetSignalConditioner(const ConfigurationInterface* configuration, int ID = -1); - std::unique_ptr>> GetChannels(ConfigurationInterface* configuration, + std::unique_ptr>> GetChannels(const ConfigurationInterface* configuration, Concurrent_Queue* queue); // NOLINT(performance-unnecessary-value-param) - std::unique_ptr GetObservables(ConfigurationInterface* configuration); + std::unique_ptr GetObservables(const ConfigurationInterface* configuration); - std::unique_ptr GetPVT(ConfigurationInterface* configuration); + std::unique_ptr GetPVT(const ConfigurationInterface* configuration); /*! * \brief Returns the block with the required configuration and implementation */ - std::unique_ptr GetBlock(ConfigurationInterface* configuration, + std::unique_ptr GetBlock(const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue = nullptr); // NOLINT(performance-unnecessary-value-param) private: - std::unique_ptr GetChannel_1C(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_1C(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_2S(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_2S(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_1B(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_1B(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_5X(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_5X(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_L5(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_L5(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_1G(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_1G(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_2G(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_2G(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_B1(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_B1(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); - std::unique_ptr GetChannel_B3(ConfigurationInterface* configuration, + std::unique_ptr GetChannel_B3(const ConfigurationInterface* configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, Concurrent_Queue* queue); std::unique_ptr GetAcqBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams); std::unique_ptr GetTrkBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams); std::unique_ptr GetTlmBlock( - ConfigurationInterface* configuration, + const ConfigurationInterface* configuration, const std::string& role, const std::string& implementation, unsigned int in_streams, unsigned int out_streams);