From 07113fd89ddeea078469531fd3cc65f536eb9801 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 16 Aug 2017 00:58:10 +0200 Subject: [PATCH] Use the override special identifier when overriding a virtual function --- src/algorithms/PVT/adapters/rtklib_pvt.h | 16 ++++----- ...alileo_e1_pcps_8ms_ambiguous_acquisition.h | 33 ++++++++++--------- .../galileo_e1_pcps_ambiguous_acquisition.h | 33 ++++++++++--------- ...leo_e1_pcps_cccwsr_ambiguous_acquisition.h | 33 ++++++++++--------- ..._e1_pcps_quicksync_ambiguous_acquisition.h | 33 ++++++++++--------- ...lileo_e1_pcps_tong_ambiguous_acquisition.h | 33 ++++++++++--------- ...lileo_e5a_noncoherent_iq_acquisition_caf.h | 32 +++++++++--------- .../adapters/gps_l1_ca_pcps_acquisition.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_acquisition_fine_doppler.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_acquisition_fpga.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_assisted_acquisition.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_multithread_acquisition.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_opencl_acquisition.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_quicksync_acquisition.h | 33 ++++++++++--------- .../gps_l1_ca_pcps_tong_acquisition.h | 33 ++++++++++--------- .../adapters/gps_l2_m_pcps_acquisition.h | 33 ++++++++++--------- src/algorithms/channel/adapters/channel.h | 26 ++++++++------- .../adapters/array_signal_conditioner.h | 17 +++++----- .../conditioner/adapters/signal_conditioner.h | 18 +++++----- .../adapters/byte_to_short.h | 16 +++++---- .../adapters/ibyte_to_cbyte.h | 16 +++++---- .../adapters/ibyte_to_complex.h | 16 +++++---- .../adapters/ibyte_to_cshort.h | 16 +++++---- .../adapters/ishort_to_complex.h | 16 +++++---- .../adapters/ishort_to_cshort.h | 16 +++++---- .../input_filter/adapters/beamformer_filter.h | 18 ++++++---- .../input_filter/adapters/fir_filter.h | 18 +++++----- .../adapters/freq_xlating_fir_filter.h | 17 ++++++---- .../adapters/pulse_blanking_filter.h | 17 ++++++---- .../observables/adapters/hybrid_observables.h | 20 ++++++----- .../adapters/direct_resampler_conditioner.h | 20 ++++++----- .../adapters/signal_generator.h | 20 ++++++----- .../adapters/file_signal_source.h | 18 ++++++---- .../adapters/flexiband_signal_source.h | 19 ++++++----- .../adapters/gen_signal_source.h | 16 ++++----- .../adapters/gn3s_signal_source.h | 16 +++++---- .../adapters/nsr_file_signal_source.h | 21 ++++++++---- .../adapters/osmosdr_signal_source.h | 15 +++++---- .../adapters/raw_array_signal_source.h | 17 ++++++---- .../adapters/rtl_tcp_signal_source.h | 15 +++++---- .../adapters/spir_file_signal_source.h | 21 ++++++++---- .../adapters/two_bit_cpx_file_signal_source.h | 21 ++++++++---- .../two_bit_packed_file_signal_source.h | 25 ++++++++++---- .../adapters/uhd_signal_source.h | 18 +++++----- .../adapters/galileo_e1b_telemetry_decoder.h | 25 ++++++++------ .../adapters/galileo_e5a_telemetry_decoder.h | 25 ++++++++------ .../adapters/gps_l1_ca_telemetry_decoder.h | 24 ++++++++------ .../adapters/gps_l2c_telemetry_decoder.h | 24 ++++++++------ .../adapters/sbas_l1_telemetry_decoder.h | 25 ++++++++------ .../galileo_e1_dll_pll_veml_tracking.h | 23 +++++++------ .../galileo_e1_tcp_connector_tracking.h | 23 +++++++------ .../adapters/galileo_e5a_dll_pll_tracking.h | 22 ++++++------- .../gps_l1_ca_dll_pll_c_aid_tracking.h | 24 +++++++------- .../gps_l1_ca_dll_pll_c_aid_tracking_fpga.h | 21 ++++++------ .../adapters/gps_l1_ca_dll_pll_tracking.h | 20 +++++------ .../adapters/gps_l1_ca_dll_pll_tracking_gpu.h | 20 +++++------ .../gps_l1_ca_tcp_connector_tracking.h | 21 ++++++------ .../adapters/gps_l2_m_dll_pll_tracking.h | 21 ++++++------ 58 files changed, 727 insertions(+), 610 deletions(-) diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h index 33d04ecf0..242d73743 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.h +++ b/src/algorithms/PVT/adapters/rtklib_pvt.h @@ -53,29 +53,29 @@ public: virtual ~RtklibPvt(); - std::string role() + std::string role() override { return role_; } //! Returns "RTKLIB_Pvt" - std::string implementation() + std::string implementation() override { return "RTKLIB_PVT"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; - void reset() + void reset() override { return; } //! All blocks must have an item_size() function implementation. Returns sizeof(gr_complex) - size_t item_size() + size_t item_size() override { return sizeof(gr_complex); } 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 75c25b0a7..66e3ad2da 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 @@ -54,7 +54,7 @@ public: virtual ~GalileoE1Pcps8msAmbiguousAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -62,66 +62,67 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition" */ - std::string implementation() + std::string implementation() override { return "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for Galileo E1 PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; private: ConfigurationInterface* configuration_; 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 b98bcbcb6..aa6b08244 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -58,7 +58,7 @@ public: virtual ~GalileoE1PcpsAmbiguousAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -66,66 +66,67 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition" */ - std::string implementation() + std::string implementation() override { return "Galileo_E1_PCPS_Ambiguous_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for Galileo E1 PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 228b4a527..d2aaf0ae2 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 @@ -54,7 +54,7 @@ public: virtual ~GalileoE1PcpsCccwsrAmbiguousAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -62,63 +62,64 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition" */ - std::string implementation() + std::string implementation() override { return "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of CCCWSR algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 847419692..389899988 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 @@ -54,7 +54,7 @@ public: virtual ~GalileoE1PcpsQuickSyncAmbiguousAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -62,66 +62,67 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_Ambiguous_Acquisition" */ - std::string implementation() + std::string implementation() override { return "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for Galileo E1 PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 dd7b7db34..e249da597 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 @@ -54,7 +54,7 @@ public: virtual ~GalileoE1PcpsTongAmbiguousAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -62,66 +62,67 @@ public: /*! * \brief Returns "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition" */ - std::string implementation() + std::string implementation() override { return "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of TONG algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for Galileo E1 TONG acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 e2a867c63..ac91d3394 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 @@ -55,7 +55,7 @@ public: virtual ~GalileoE5aNoncoherentIQAcquisitionCaf(); - std::string role() + std::string role() override { return role_; } @@ -63,67 +63,67 @@ public: /*! * \brief Returns "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF" */ - std::string implementation() + std::string implementation() override { return "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF"; } - size_t item_size() + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local Galileo E5a code for PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If set to 1, ensures that acquisition starts at the 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 a32cc81a4..0352b6b5a 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -63,7 +63,7 @@ public: virtual ~GpsL1CaPcpsAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -71,66 +71,67 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L1/CA PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 0b6796a8b..89b3160ec 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 @@ -56,7 +56,7 @@ public: virtual ~GpsL1CaPcpsAcquisitionFineDoppler(); - std::string role() + std::string role() override { return role_; } @@ -64,63 +64,64 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(boost::shared_ptr top_block); - void disconnect(boost::shared_ptr top_block); - boost::shared_ptr get_left_block(); - boost::shared_ptr get_right_block(); + void connect(boost::shared_ptr top_block) override; + void disconnect(boost::shared_ptr top_block) override; + boost::shared_ptr get_left_block() override; + boost::shared_ptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; private: pcps_acquisition_fine_doppler_cc_sptr acquisition_cc_; 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 186d255e6..67c77a154 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 @@ -58,7 +58,7 @@ public: virtual ~GpsL1CaPcpsAcquisitionFpga(); - std::string role() + std::string role() override { return role_; } @@ -66,66 +66,67 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_Acquisition_Fpga"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L1/CA PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 d2faf3f51..b5fc81791 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 @@ -56,7 +56,7 @@ public: virtual ~GpsL1CaPcpsAssistedAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -64,63 +64,64 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Assisted_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_Assisted_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; private: pcps_assisted_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h index 8b1f1af0a..c00d21d9c 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.h @@ -55,7 +55,7 @@ public: virtual ~GpsL1CaPcpsMultithreadAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -63,66 +63,67 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Multithread_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_Multithread_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L1/CA PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; private: ConfigurationInterface* configuration_; 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 9eea40659..325720f5a 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 @@ -55,7 +55,7 @@ public: virtual ~GpsL1CaPcpsOpenClAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -63,66 +63,67 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_OpenCl_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_OpenCl_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L1/CA PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; private: ConfigurationInterface* configuration_; 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 2e32df150..283c3bbaf 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 @@ -57,7 +57,7 @@ public: virtual ~GpsL1CaPcpsQuickSyncAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -65,66 +65,67 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_QuickSync_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_QuickSync_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L1/CA PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 a43dd3e99..dc7946a16 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 @@ -54,7 +54,7 @@ public: virtual ~GpsL1CaPcpsTongAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -62,66 +62,67 @@ public: /*! * \brief Returns "GPS_L1_CA_PCPS_Tong_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_PCPS_Tong_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of TONG algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L1/CA TONG acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample 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 308a1a590..38d64cd18 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -61,7 +61,7 @@ public: virtual ~GpsL2MPcpsAcquisition(); - std::string role() + std::string role() override { return role_; } @@ -69,66 +69,67 @@ public: /*! * \brief Returns "GPS_L2_M_PCPS_Acquisition" */ - std::string implementation() + std::string implementation() override { return "GPS_L2_M_PCPS_Acquisition"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set statistics threshold of PCPS algorithm */ - void set_threshold(float threshold); + void set_threshold(float threshold) override; /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max); + void set_doppler_max(unsigned int doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step); + void set_doppler_step(unsigned int doppler_step) override; /*! * \brief Initializes acquisition algorithm. */ - void init(); + void init() override; /*! * \brief Sets local code for GPS L2/M PCPS acquisition algorithm. */ - void set_local_code(); + void set_local_code() override; /*! * \brief Returns the maximum peak of grid search */ - signed int mag(); + signed int mag() override; /*! * \brief Restart acquisition algorithm */ - void reset(); + void reset() override; /*! * \brief If state = 1, it forces the block to start acquiring from the first sample diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 0060111de..e3e662566 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -67,25 +67,29 @@ public: boost::shared_ptr queue); //! Virtual destructor virtual ~Channel(); - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - std::string role(){ return role_; } + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + std::string role() override { return role_; } //! Returns "Channel" - std::string implementation(){ return implementation_; } - size_t item_size(){ return 0; } - Gnss_Signal get_signal() const { return gnss_signal_; } + std::string implementation() override { return implementation_; } + + size_t item_size() override { return 0; } + Gnss_Signal get_signal() const override { return gnss_signal_; } + + void start_acquisition() override; //!< Start the State Machine + void set_signal(const Gnss_Signal& gnss_signal_) override; //!< Sets the channel GNSS signal + std::shared_ptr acquisition(){ return acq_; } std::shared_ptr tracking(){ return trk_; } std::shared_ptr telemetry(){ return nav_; } - void start_acquisition(); //!< Start the State Machine - void set_signal(const Gnss_Signal& gnss_signal_); //!< Sets the channel GNSS signal void msg_handler_events(pmt::pmt_t msg); - private: channel_msg_receiver_cc_sptr channel_msg_rx; std::shared_ptr pass_through_; diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h index d0f100402..aaf3336b7 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h @@ -58,15 +58,15 @@ public: //! Virtual destructor virtual ~ArraySignalConditioner(); - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; - std::string role(){ return role_; } - //! Returns "Signal_Conditioner" - std::string implementation(){ return "Array_Signal_Conditioner"; } - size_t item_size(){ return 0; } + std::string role() override { return role_; } + //! Returns "Array_Signal_Conditioner" + std::string implementation() override { return "Array_Signal_Conditioner"; } + size_t item_size() override { return 0; } std::shared_ptr data_type_adapter(){ return data_type_adapt_; } std::shared_ptr input_filter(){ return in_filt_; } @@ -79,7 +79,6 @@ private: std::string role_; std::string implementation_; bool connected_; - //bool stop_; }; #endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/ diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index de830368d..4b0f2fe3e 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -56,15 +56,16 @@ public: //! Virtual destructor virtual ~SignalConditioner(); - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; - std::string role(){ return role_; } - //! Returns "Signal_Conditioner" - std::string implementation(){ return "Signal_Conditioner"; } - size_t item_size(){ return 0; } + std::string role() override { return role_; } + + std::string implementation() override { return "Signal_Conditioner"; } //!< Returns "Signal_Conditioner" + + size_t item_size() override { return 0; } std::shared_ptr data_type_adapter(){ return data_type_adapt_; } std::shared_ptr input_filter(){ return in_filt_; } @@ -77,7 +78,6 @@ private: std::string role_; std::string implementation_; bool connected_; - //bool stop_; }; #endif /*GNSS_SDR_SIGNAL_CONDITIONER_H_*/ 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 ff241d5ce..d970bfaaa 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h @@ -52,24 +52,26 @@ public: virtual ~ByteToShort(); - std::string role() + std::string role() override { return role_; } + //! Returns "Byte_To_Short" - std::string implementation() + std::string implementation() override { return "Byte_To_Short"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: gr::blocks::char_to_short::sptr gr_char_to_short_; 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 5eafe5587..be11f0f3d 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h @@ -53,24 +53,26 @@ public: virtual ~IbyteToCbyte(); - std::string role() + std::string role() override { return role_; } + //! Returns "Ibyte_To_Cbyte" - std::string implementation() + std::string implementation() override { return "Ibyte_To_Cbyte"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: interleaved_byte_to_complex_byte_sptr ibyte_to_cbyte_; 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 228e15435..20cc8cfbd 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h @@ -53,24 +53,26 @@ public: virtual ~IbyteToComplex(); - std::string role() + std::string role() override { return role_; } + //! Returns "Ibyte_To_Complex" - std::string implementation() + std::string implementation() override { return "Ibyte_To_Complex"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: gr::blocks::interleaved_char_to_complex::sptr gr_interleaved_char_to_complex_; 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 a5a716aff..fd0712a54 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h @@ -53,24 +53,26 @@ public: virtual ~IbyteToCshort(); - std::string role() + std::string role() override { return role_; } + //! Returns "Ibyte_To_Cshort" - std::string implementation() + std::string implementation() override { return "Ibyte_To_Cshort"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: interleaved_byte_to_complex_short_sptr interleaved_byte_to_complex_short_; 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 e12b23bdc..59bd00710 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h @@ -52,24 +52,26 @@ public: virtual ~IshortToComplex(); - std::string role() + std::string role() override { return role_; } + //! Returns "Ishort_To_Complex" - std::string implementation() + std::string implementation() override { return "Ishort_To_Complex"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: gr::blocks::interleaved_short_to_complex::sptr gr_interleaved_short_to_complex_; 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 9cc5ae959..e9ec9f591 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h @@ -53,24 +53,26 @@ public: virtual ~IshortToCshort(); - std::string role() + std::string role() override { return role_; } + //! Returns "Ishort_To_Cshort" - std::string implementation() + std::string implementation() override { return "Ishort_To_Cshort"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: interleaved_short_to_complex_short_sptr interleaved_short_to_complex_short_; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h index b23d293cd..4f651032e 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.h +++ b/src/algorithms/input_filter/adapters/beamformer_filter.h @@ -50,23 +50,27 @@ public: unsigned int out_stream); virtual ~BeamformerFilter(); - std::string role() + + std::string role() override { return role_; } + //! returns "Direct_Resampler" - std::string implementation() + std::string implementation() override { return "Beamformer_Filter"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h index 958266cbe..c449e002b 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.h +++ b/src/algorithms/input_filter/adapters/fir_filter.h @@ -70,24 +70,27 @@ public: //! Destructor virtual ~FirFilter(); - std::string role() + + std::string role() override { return role_; } //! Returns "Fir_Filter" - std::string implementation() + std::string implementation() override { return "Fir_Filter"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: gr::filter::fir_filter_ccf::sptr fir_filter_ccf_; @@ -114,7 +117,6 @@ private: gr::blocks::float_to_short::sptr float_to_short_1_; gr::blocks::float_to_short::sptr float_to_short_2_; short_x2_to_cshort_sptr short_x2_to_cshort_; - }; #endif 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 caac52ddc..ad19dcd2c 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h @@ -68,24 +68,27 @@ public: unsigned int out_streams); virtual ~FreqXlatingFirFilter(); - std::string role() + + std::string role() override { return role_; } //! Returns "Freq_Xlating_Fir_Filter" - std::string implementation() + std::string implementation() override { return "Freq_Xlating_Fir_Filter"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: gr::filter::freq_xlating_fir_filter_ccf::sptr freq_xlating_fir_filter_ccf_; diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h index 4382e4281..fea5ad8ef 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h @@ -50,24 +50,27 @@ public: unsigned int out_streams); virtual ~PulseBlankingFilter(); - std::string role() + + std::string role() override { return role_; } //! Returns "Pulse_Blanking_Filter" - std::string implementation() + std::string implementation() override { return "Pulse_Blanking_Filter"; } - size_t item_size() + + size_t item_size() override { return 0; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: ConfigurationInterface* config_; diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h index 98bc9216f..549971dc2 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.h +++ b/src/algorithms/observables/adapters/hybrid_observables.h @@ -51,28 +51,32 @@ public: std::string role, unsigned int in_streams, unsigned int out_streams); + virtual ~HybridObservables(); - std::string role() + + std::string role() override { return role_; } //! Returns "Hybrid_Observables" - std::string implementation() + std::string implementation() override { return "Hybrid_Observables"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - void reset() + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + void reset() override { return; } //! All blocks must have an item_size() function implementation - size_t item_size() + size_t item_size() override { return sizeof(gr_complex); } diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h index 246ec58b8..a92babddd 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h @@ -51,23 +51,27 @@ public: unsigned int out_stream); virtual ~DirectResamplerConditioner(); - std::string role() + + std::string role() override { return role_; } - //! returns "Direct_Resampler" - std::string implementation() + + //! Returns "Direct_Resampler" + std::string implementation() override { return "Direct_Resampler"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h index 623a28180..e428ba65d 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.h +++ b/src/algorithms/signal_generator/adapters/signal_generator.h @@ -57,27 +57,29 @@ public: unsigned int out_stream, boost::shared_ptr queue); virtual ~SignalGenerator(); - std::string role() + + std::string role() override { return role_; } /*! -* \brief Returns "GNSSSignalGenerator". -*/ - std::string implementation() + * \brief Returns "GNSSSignalGenerator". + */ + std::string implementation() override { return "GNSSSignalGenerator"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index 434db7f92..2ed9b56a4 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -58,7 +58,8 @@ public: boost::shared_ptr queue); virtual ~FileSignalSource(); - std::string role() + + std::string role() override { return role_; } @@ -66,18 +67,21 @@ public: /*! * \brief Returns "File_Signal_Source". */ - std::string implementation() + std::string implementation() override { return "File_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + std::string filename() { return filename_; diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h index a621d8ea3..f51e3acd3 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h @@ -57,7 +57,8 @@ public: unsigned int out_stream, gr::msg_queue::sptr queue); virtual ~FlexibandSignalSource(); - std::string role() + + std::string role() override { return role_; } @@ -65,19 +66,21 @@ public: /*! * \brief Returns "Flexiband_Signal_Source". */ - std::string implementation() + std::string implementation() override { return "Flexiband_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - gr::basic_block_sptr get_right_block(int RF_channel); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + gr::basic_block_sptr get_right_block(int RF_channel) override; private: std::string role_; diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h index b607f0320..351058f1a 100644 --- a/src/algorithms/signal_source/adapters/gen_signal_source.h +++ b/src/algorithms/signal_source/adapters/gen_signal_source.h @@ -52,18 +52,18 @@ public: //! Virtual destructor virtual ~GenSignalSource(); - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; - std::string role(){ return role_; } + std::string role() override { return role_; } //! Returns "Signal Source" - std::string implementation(){ return "Signal Source"; } - size_t item_size(){ return 0; } + std::string implementation() override { return "Signal Source"; } + size_t item_size() override { return 0; } - GNSSBlockInterface *signal_generator(){ return signal_generator_; } + GNSSBlockInterface *signal_generator() { return signal_generator_; } private: GNSSBlockInterface *signal_generator_; diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index c8a566e7b..fffe3aa8a 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -52,7 +52,7 @@ public: unsigned int out_stream, gr::msg_queue::sptr queue); virtual ~Gn3sSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -60,18 +60,20 @@ public: /*! * \brief Returns "Gn3sSignalSource". */ - std::string implementation() + std::string implementation() override { return "Gn3sSignalSource"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; 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 fabaa10f4..e0869dcff 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -59,7 +59,7 @@ public: boost::shared_ptr queue); virtual ~NsrFileSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -67,34 +67,41 @@ public: /*! * \brief Returns "Nsr_File_Signal_Source". */ - std::string implementation() + std::string implementation() override { return "Nsr_File_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + std::string filename() { return filename_; } + std::string item_type() { return item_type_; } + bool repeat() { return repeat_; } + long sampling_frequency() { return sampling_frequency_; } + long samples() { return samples_; diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h index 886d713d7..ed71d9551 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h @@ -56,7 +56,7 @@ public: virtual ~OsmosdrSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -64,19 +64,20 @@ public: /*! * \brief Returns "Osmosdr_Signal_Source" */ - std::string implementation() + std::string implementation() override { return "Osmosdr_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; 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 93501273f..c44a03a28 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h @@ -52,7 +52,8 @@ public: unsigned int out_stream, gr::msg_queue::sptr queue); virtual ~RawArraySignalSource(); - std::string role() + + std::string role() override { return role_; } @@ -60,18 +61,20 @@ public: /*! * \brief Returns "RawArraySignalSource". */ - std::string implementation() + std::string implementation() override { return "Raw_Array_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; 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 8635d0b0b..804a41f34 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h @@ -57,7 +57,7 @@ public: virtual ~RtlTcpSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -65,19 +65,20 @@ public: /*! * \brief Returns "RtlTcp_Signal_Source" */ - std::string implementation() + std::string implementation() override { return "RtlTcp_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; private: std::string role_; 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 5cc88d24b..ccba78788 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h @@ -56,7 +56,7 @@ public: boost::shared_ptr queue); virtual ~SpirFileSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -64,34 +64,41 @@ public: /*! * \brief Returns "Spir_File_Signal_Source". */ - std::string implementation() + std::string implementation() override { return "Spir_File_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + std::string filename() { return filename_; } + std::string item_type() { return item_type_; } + bool repeat() { return repeat_; } + long sampling_frequency() { return sampling_frequency_; } + long samples() { return samples_; 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 a7f8d1adc..b1f2758f6 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 @@ -60,7 +60,7 @@ public: boost::shared_ptr queue); virtual ~TwoBitCpxFileSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -68,34 +68,41 @@ public: /*! * \brief Returns "Two_Bit_Cpx_File_Signal_Source". */ - std::string implementation() + std::string implementation() override { return "Two_Bit_Cpx_File_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + std::string filename() { return filename_; } + std::string item_type() { return item_type_; } + bool repeat() { return repeat_; } + long sampling_frequency() { return sampling_frequency_; } + long samples() { return samples_; 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 48a365c61..5697ef58f 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 @@ -61,7 +61,7 @@ public: boost::shared_ptr queue); virtual ~TwoBitPackedFileSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -69,50 +69,61 @@ public: /*! * \brief Returns "Two_Bit_Packed_File_Signal_Source". */ - std::string implementation() + std::string implementation() override { return "Two_Bit_Packed_File_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + std::string filename() { return filename_; } + std::string item_type() { return item_type_; } + bool repeat() { return repeat_; } + long sampling_frequency() { return sampling_frequency_; } + long samples() { return samples_; } + bool big_endian_items() { return big_endian_items_; } + bool big_endian_bytes() { return big_endian_bytes_; } + bool is_complex() { return is_complex_; } + bool reverse_interleaving() { return reverse_interleaving_; diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index cda8c0270..c17f4e3c6 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -55,7 +55,7 @@ public: virtual ~UhdSignalSource(); - std::string role() + std::string role() override { return role_; } @@ -63,23 +63,23 @@ public: /*! * \brief Returns "UHD_Signal_Source" */ - std::string implementation() + std::string implementation() override { return "UHD_Signal_Source"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - gr::basic_block_sptr get_right_block(int RF_channel); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + gr::basic_block_sptr get_right_block(int RF_channel) override; private: - std::string role_; unsigned int in_stream_; unsigned int out_stream_; 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 deb2035d5..b0d336260 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -55,7 +55,8 @@ public: unsigned int out_streams); virtual ~GalileoE1BTelemetryDecoder(); - std::string role() + + std::string role() override { return role_; } @@ -63,21 +64,25 @@ public: /*! * \brief Returns "Galileo_E1B_Telemetry_Decoder" */ - std::string implementation() + std::string implementation() override { return "Galileo_E1B_Telemetry_Decoder"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - void set_satellite(Gnss_Satellite satellite); - void set_channel(int channel){telemetry_decoder_->set_channel(channel);} - void reset() + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + void set_satellite(Gnss_Satellite satellite) override; + void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);} + + void reset() override { return; } - size_t item_size() + + size_t item_size() override { return 0; } 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 9ea653e7b..005a1a4fa 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h @@ -56,7 +56,8 @@ public: unsigned int out_streams); virtual ~GalileoE5aTelemetryDecoder(); - std::string role() + + std::string role() override { return role_; } @@ -64,21 +65,25 @@ public: /*! * \brief Returns "Galileo_E5a_Telemetry_Decoder" */ - std::string implementation() + std::string implementation() override { return "Galileo_E5A_Telemetry_Decoder"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - void set_satellite(Gnss_Satellite satellite); - void set_channel(int channel){telemetry_decoder_->set_channel(channel);} - void reset() + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + void set_satellite(Gnss_Satellite satellite) override; + void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);} + + void reset() override { return; } - size_t item_size() + + size_t item_size() override { return 0; } 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 fd5f8dc1b..8e214258c 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 @@ -52,27 +52,31 @@ public: unsigned int out_streams); virtual ~GpsL1CaTelemetryDecoder(); - std::string role() + + std::string role() override { return role_; } //! Returns "GPS_L1_CA_Telemetry_Decoder" - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_Telemetry_Decoder"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - void set_satellite(Gnss_Satellite satellite); - void set_channel(int channel){telemetry_decoder_->set_channel(channel);} - void reset() + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + void set_satellite(Gnss_Satellite satellite) override; + void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);} + + void reset() override { return; } - size_t item_size() + size_t item_size() override { return 0; } 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 08ccc12f0..a81721c94 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h @@ -52,27 +52,31 @@ public: unsigned int out_streams); virtual ~GpsL2CTelemetryDecoder(); - std::string role() + + std::string role() override { return role_; } //! Returns "GPS_L2C_Telemetry_Decoder" - std::string implementation() + std::string implementation() override { return "GPS_L2C_Telemetry_Decoder"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - void set_satellite(Gnss_Satellite satellite); - void set_channel(int channel){telemetry_decoder_->set_channel(channel);} - void reset() + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + void set_satellite(Gnss_Satellite satellite) override; + void set_channel(int channel) override {telemetry_decoder_->set_channel(channel);} + + void reset() override { return; } - size_t item_size() + size_t item_size() override { return 0; } 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 58c59861e..090f67722 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -53,7 +53,8 @@ public: unsigned int out_streams); virtual ~SbasL1TelemetryDecoder(); - std::string role() + + std::string role() override { return role_; } @@ -61,21 +62,25 @@ public: /*! * \brief Returns "SBAS_L1_Telemetry_Decoder" */ - std::string implementation() + std::string implementation() override { return "SBAS_L1_Telemetry_Decoder"; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - void set_satellite(Gnss_Satellite satellite); - void set_channel(int channel){ telemetry_decoder_->set_channel(channel); } - void reset() + + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; + + void set_satellite(Gnss_Satellite satellite) override; + void set_channel(int channel) override { telemetry_decoder_->set_channel(channel); } + + void reset() override { return; } - size_t item_size() + + size_t item_size() override { return 0; } 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 874044b7b..5b0faf081 100755 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h @@ -59,41 +59,40 @@ public: virtual ~GalileoE1DllPllVemlTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "Galileo_E1_DLL_PLL_VEML_Tracking" - std::string implementation() + std::string implementation() override { return "Galileo_E1_DLL_PLL_VEML_Tracking"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - - void start_tracking(); + void start_tracking() override; private: galileo_e1_dll_pll_veml_tracking_cc_sptr tracking_; 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 c4e0c3e6a..485bd809f 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h @@ -59,41 +59,40 @@ public: virtual ~GalileoE1TcpConnectorTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "Galileo_E1_TCP_CONNECTOR_Tracking" - std::string implementation() + std::string implementation() override { return "Galileo_E1_TCP_CONNECTOR_Tracking"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and * tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - - void start_tracking(); + void start_tracking() override; private: galileo_e1_tcp_connector_tracking_cc_sptr tracking_; 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 b9b46780a..6d45c7b37 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h @@ -59,39 +59,39 @@ public: virtual ~GalileoE5aDllPllTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "Galileo_E5a_DLL_PLL_Tracking" - std::string implementation() + std::string implementation() override { return "Galileo_E5a_DLL_PLL_Tracking"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - - void start_tracking(); + void start_tracking() override; private: galileo_e5a_dll_pll_tracking_cc_sptr tracking_; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h index f8c395b24..375c2d621 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h @@ -52,7 +52,6 @@ class ConfigurationInterface; class GpsL1CaDllPllCAidTracking : public TrackingInterface { public: - GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, @@ -60,40 +59,39 @@ public: virtual ~GpsL1CaDllPllCAidTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking" - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - - void start_tracking(); + void start_tracking() override; private: gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr tracking_cc; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h index 6394d1a2c..fe7bf561f 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking_fpga.h @@ -57,39 +57,40 @@ public: virtual ~GpsL1CaDllPllCAidTrackingFpga(); - std::string role() + std::string role() override { return role_; } //! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking_Fpga" - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking_Fpga"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; // CONVERT TO SOURCE - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - void start_tracking(); + void start_tracking() override; void reset(void); 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 3f6594944..538f50ae9 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 @@ -58,39 +58,39 @@ public: virtual ~GpsL1CaDllPllTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "GPS_L1_CA_DLL_PLL_Tracking" - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_DLL_PLL_Tracking"; } - size_t item_size() + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - void start_tracking(); + void start_tracking() override; private: gps_l1_ca_dll_pll_tracking_cc_sptr tracking_; 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 263268946..b4699aef2 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 @@ -57,38 +57,38 @@ public: virtual ~GpsL1CaDllPllTrackingGPU(); - std::string role() + std::string role() override { return role_; } //! Returns "GPS_L1_CA_DLL_PLL_Tracking_GPU" - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_DLL_PLL_Tracking_GPU"; } - size_t item_size() + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - void start_tracking(); + void start_tracking() override; private: gps_l1_ca_dll_pll_tracking_gpu_cc_sptr tracking_; 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 32d91e34f..0a5313450 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 @@ -60,40 +60,41 @@ public: virtual ~GpsL1CaTcpConnectorTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "GPS_L1_CA_TCP_CONNECTOR_Tracking" - std::string implementation() + std::string implementation() override { return "GPS_L1_CA_TCP_CONNECTOR_Tracking"; } - size_t item_size() + + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - void start_tracking(); + void start_tracking() override; private: 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 cd174b2f7..aef85f4fc 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 @@ -58,40 +58,39 @@ public: virtual ~GpsL2MDllPllTracking(); - std::string role() + std::string role() override { return role_; } //! Returns "GPS_L2_M_DLL_PLL_Tracking" - std::string implementation() + std::string implementation() override { return "GPS_L2_M_DLL_PLL_Tracking"; } - size_t item_size() + size_t item_size() override { return item_size_; } - void connect(gr::top_block_sptr top_block); - void disconnect(gr::top_block_sptr top_block); - gr::basic_block_sptr get_left_block(); - gr::basic_block_sptr get_right_block(); - + void connect(gr::top_block_sptr top_block) override; + void disconnect(gr::top_block_sptr top_block) override; + gr::basic_block_sptr get_left_block() override; + gr::basic_block_sptr get_right_block() override; /*! * \brief Set tracking channel unique ID */ - void set_channel(unsigned int channel); + void set_channel(unsigned int channel) override; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer * to efficiently exchange synchronization data between acquisition and tracking blocks */ - void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro); + void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; - void start_tracking(); + void start_tracking() override; private: gps_l2_m_dll_pll_tracking_cc_sptr tracking_;