diff options
author | Marcus Müller <mmueller@gnuradio.org> | 2020-10-30 18:22:33 +0100 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-11-03 14:07:23 -0500 |
commit | 0ddc7dbc95ca6fb4c4a62a3c027104d6dd71fc3b (patch) | |
tree | b454053fdc123711f3011b8a703de38e1d783ba3 /gr-uhd/lib/usrp_source_impl.h | |
parent | 1cfd6287635e339b313e1826fdfda23f474c91c8 (diff) |
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.h')
-rw-r--r-- | gr-uhd/lib/usrp_source_impl.h | 113 |
1 files changed, 57 insertions, 56 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h index 1d14cedf47..3067fec819 100644 --- a/gr-uhd/lib/usrp_source_impl.h +++ b/gr-uhd/lib/usrp_source_impl.h @@ -36,82 +36,83 @@ public: usrp_source_impl(const ::uhd::device_addr_t& device_addr, const ::uhd::stream_args_t& stream_args, const bool issue_stream_cmd_on_start = true); - ~usrp_source_impl(); + ~usrp_source_impl() override; // Get Commands - ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan); - std::string get_subdev_spec(size_t mboard); - double get_samp_rate(void); - ::uhd::meta_range_t get_samp_rates(void); - double get_center_freq(size_t chan); - ::uhd::freq_range_t get_freq_range(size_t chan); - double get_gain(size_t chan); - double get_gain(const std::string& name, size_t chan); - double get_normalized_gain(size_t chan); - std::vector<std::string> get_gain_names(size_t chan); - ::uhd::gain_range_t get_gain_range(size_t chan); - ::uhd::gain_range_t get_gain_range(const std::string& name, size_t chan); - bool has_power_reference(size_t chan); - double get_power_reference(size_t chan); - ::uhd::meta_range_t get_power_range(size_t chan); - std::string get_antenna(size_t chan); - std::vector<std::string> get_antennas(size_t chan); - ::uhd::sensor_value_t get_sensor(const std::string& name, size_t chan); - std::vector<std::string> get_sensor_names(size_t chan); - ::uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan); - std::vector<std::string> get_lo_names(size_t chan); - const std::string get_lo_source(const std::string& name, size_t chan); - std::vector<std::string> get_lo_sources(const std::string& name, size_t chan); - bool get_lo_export_enabled(const std::string& name, size_t chan); - double get_lo_freq(const std::string& name, size_t chan); - ::uhd::freq_range_t get_lo_freq_range(const std::string& name, size_t chan); + ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan) override; + std::string get_subdev_spec(size_t mboard) override; + double get_samp_rate(void) override; + ::uhd::meta_range_t get_samp_rates(void) override; + double get_center_freq(size_t chan) override; + ::uhd::freq_range_t get_freq_range(size_t chan) override; + double get_gain(size_t chan) override; + double get_gain(const std::string& name, size_t chan) override; + double get_normalized_gain(size_t chan) override; + std::vector<std::string> get_gain_names(size_t chan) override; + ::uhd::gain_range_t get_gain_range(size_t chan) override; + ::uhd::gain_range_t get_gain_range(const std::string& name, size_t chan) override; + bool has_power_reference(size_t chan) override; + double get_power_reference(size_t chan) override; + ::uhd::meta_range_t get_power_range(size_t chan) override; + std::string get_antenna(size_t chan) override; + std::vector<std::string> get_antennas(size_t chan) override; + ::uhd::sensor_value_t get_sensor(const std::string& name, size_t chan) override; + std::vector<std::string> get_sensor_names(size_t chan) override; + ::uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan) override; + std::vector<std::string> get_lo_names(size_t chan) override; + const std::string get_lo_source(const std::string& name, size_t chan) override; + std::vector<std::string> get_lo_sources(const std::string& name, + size_t chan) override; + bool get_lo_export_enabled(const std::string& name, size_t chan) override; + double get_lo_freq(const std::string& name, size_t chan) override; + ::uhd::freq_range_t get_lo_freq_range(const std::string& name, size_t chan) override; // Set Commands - void set_subdev_spec(const std::string& spec, size_t mboard); - void set_samp_rate(double rate); + void set_subdev_spec(const std::string& spec, size_t mboard) override; + void set_samp_rate(double rate) override; ::uhd::tune_result_t set_center_freq(const ::uhd::tune_request_t tune_request, - size_t chan); - void set_gain(double gain, size_t chan); - void set_gain(double gain, const std::string& name, size_t chan); - void set_rx_agc(const bool enable, size_t chan); - void set_normalized_gain(double gain, size_t chan); - void set_power_reference(double power_dbm, size_t chan); - void set_antenna(const std::string& ant, size_t chan); - void set_bandwidth(double bandwidth, size_t chan); - double get_bandwidth(size_t chan); - ::uhd::freq_range_t get_bandwidth_range(size_t chan); - void set_auto_dc_offset(const bool enable, size_t chan); - void set_dc_offset(const std::complex<double>& offset, size_t chan); - void set_auto_iq_balance(const bool enable, size_t chan); - void set_iq_balance(const std::complex<double>& correction, size_t chan); - void set_stream_args(const ::uhd::stream_args_t& stream_args); - void set_start_time(const ::uhd::time_spec_t& time); + size_t chan) override; + void set_gain(double gain, size_t chan) override; + void set_gain(double gain, const std::string& name, size_t chan) override; + void set_rx_agc(const bool enable, size_t chan) override; + void set_normalized_gain(double gain, size_t chan) override; + void set_power_reference(double power_dbm, size_t chan) override; + void set_antenna(const std::string& ant, size_t chan) override; + void set_bandwidth(double bandwidth, size_t chan) override; + double get_bandwidth(size_t chan) override; + ::uhd::freq_range_t get_bandwidth_range(size_t chan) override; + void set_auto_dc_offset(const bool enable, size_t chan) override; + void set_dc_offset(const std::complex<double>& offset, size_t chan) override; + void set_auto_iq_balance(const bool enable, size_t chan) override; + void set_iq_balance(const std::complex<double>& correction, size_t chan) override; + void set_stream_args(const ::uhd::stream_args_t& stream_args) override; + void set_start_time(const ::uhd::time_spec_t& time) override; void set_lo_source(const std::string& src, const std::string& name = ALL_LOS, - size_t chan = 0); + size_t chan = 0) override; void set_lo_export_enabled(bool enabled, const std::string& name = ALL_LOS, - size_t chan = 0); - double set_lo_freq(double freq, const std::string& name, size_t chan); + size_t chan = 0) override; + double set_lo_freq(double freq, const std::string& name, size_t chan) override; - void issue_stream_cmd(const ::uhd::stream_cmd_t& cmd); - void set_recv_timeout(const double timeout, const bool one_packet); + void issue_stream_cmd(const ::uhd::stream_cmd_t& cmd) override; + void set_recv_timeout(const double timeout, const bool one_packet) override; void flush(void); - bool start(void); - bool stop(void); - std::vector<std::complex<float>> finite_acquisition(const size_t nsamps); + bool start(void) override; + bool stop(void) override; + std::vector<std::complex<float>> finite_acquisition(const size_t nsamps) override; std::vector<std::vector<std::complex<float>>> - finite_acquisition_v(const size_t nsamps); + finite_acquisition_v(const size_t nsamps) override; int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) override; - void setup_rpc(); + void setup_rpc() override; private: //! Like set_center_freq(), but uses _curr_freq and _curr_lo_offset ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan, - pmt::pmt_t direction); + pmt::pmt_t direction) override; void _cmd_handler_tag(const pmt::pmt_t& tag); ::uhd::rx_streamer::sptr _rx_stream; |