diff options
| author | Tom Rondeau | 2011-05-02 11:25:17 +0100 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-02 11:25:17 +0100 |
| commit | 7a91b8226f71d75b027beb466f965bbba97c07a8 (patch) | |
| tree | d61974e19b00628084bc613cf8b7b1ae3c15b3be /gr-uhd/include | |
| parent | e1558e1c529d7840a7f6abd366b023cffe3d630e (diff) | |
| parent | 517bee34087044336f83c4717734d3d1f5ff5b02 (diff) | |
| download | gnuradio-7a91b8226f71d75b027beb466f965bbba97c07a8.tar.gz gnuradio-7a91b8226f71d75b027beb466f965bbba97c07a8.tar.bz2 gnuradio-7a91b8226f71d75b027beb466f965bbba97c07a8.zip | |
Merge branch 'mergeme/uhd/gain_names'
Diffstat (limited to 'gr-uhd/include')
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 32 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 32 |
2 files changed, 64 insertions, 0 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index 0475957de..320d07d41 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -101,6 +101,14 @@ public: virtual void set_gain(double gain, size_t chan = 0) = 0; /*! + * Set the named gain on the dboard. + * \param gain the gain in dB + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + */ + virtual void set_gain(double gain, const std::string &name, size_t chan = 0) = 0; + + /*! * Get the actual dboard gain setting. * \param chan the channel index 0 to N-1 * \return the actual gain in dB @@ -108,6 +116,22 @@ public: virtual double get_gain(size_t chan = 0) = 0; /*! + * Get the actual dboard gain setting of named stage. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double get_gain(const std::string &name, size_t chan = 0) = 0; + + /*! + * Get the actual dboard gain setting of named stage. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual std::vector<std::string> get_gain_names(size_t chan = 0) = 0; + + /*! * Get the settable gain range. * \param chan the channel index 0 to N-1 * \return the gain range in dB @@ -115,6 +139,14 @@ public: virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0; /*! + * Get the settable gain range. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the gain range in dB + */ + virtual uhd::gain_range_t get_gain_range(const std::string &name, size_t chan = 0) = 0; + + /*! * Set the antenna to use. * \param ant the antenna string * \param chan the channel index 0 to N-1 diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 038f9a91e..36331f782 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -101,6 +101,14 @@ public: virtual void set_gain(double gain, size_t chan = 0) = 0; /*! + * Set the named gain on the dboard. + * \param gain the gain in dB + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + */ + virtual void set_gain(double gain, const std::string &name, size_t chan = 0) = 0; + + /*! * Get the actual dboard gain setting. * \param chan the channel index 0 to N-1 * \return the actual gain in dB @@ -108,6 +116,22 @@ public: virtual double get_gain(size_t chan = 0) = 0; /*! + * Get the actual dboard gain setting of named stage. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double get_gain(const std::string &name, size_t chan = 0) = 0; + + /*! + * Get the actual dboard gain setting of named stage. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual std::vector<std::string> get_gain_names(size_t chan = 0) = 0; + + /*! * Get the settable gain range. * \param chan the channel index 0 to N-1 * \return the gain range in dB @@ -115,6 +139,14 @@ public: virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0; /*! + * Get the settable gain range. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the gain range in dB + */ + virtual uhd::gain_range_t get_gain_range(const std::string &name, size_t chan = 0) = 0; + + /*! * Set the antenna to use. * \param ant the antenna string * \param chan the channel index 0 to N-1 |