summaryrefslogtreecommitdiff
path: root/gr-uhd/lib/uhd_single_usrp_source.h
diff options
context:
space:
mode:
Diffstat (limited to 'gr-uhd/lib/uhd_single_usrp_source.h')
-rw-r--r--gr-uhd/lib/uhd_single_usrp_source.h35
1 files changed, 32 insertions, 3 deletions
diff --git a/gr-uhd/lib/uhd_single_usrp_source.h b/gr-uhd/lib/uhd_single_usrp_source.h
index 196b7c675..495f8c611 100644
--- a/gr-uhd/lib/uhd_single_usrp_source.h
+++ b/gr-uhd/lib/uhd_single_usrp_source.h
@@ -28,8 +28,8 @@
class uhd_single_usrp_source;
boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
- const std::string &args,
- const uhd::io_type_t::tid_t &type,
+ const std::string &device_addr,
+ const uhd::io_type_t::tid_t &io_type,
size_t num_channels = 1
);
@@ -63,13 +63,29 @@ public:
/*!
* Tune the usrp device to the desired center frequency.
+ * \param tune_request the tune request instructions
+ * \param chan the channel index 0 to N-1
+ * \return a tune result with the actual frequencies
+ */
+ virtual uhd::tune_result_t set_center_freq(
+ const uhd::tune_request_t tune_request, size_t chan
+ ) = 0;
+
+ /*!
+ * Tune the usrp device to the desired center frequency.
+ * This is a wrapper around set center freq so that in this case,
+ * the user can pass a single frequency in the call through swig.
* \param freq the desired frequency in Hz
+ * \param chan the channel index 0 to N-1
* \return a tune result with the actual frequencies
*/
- virtual uhd::tune_result_t set_center_freq(double freq, size_t chan = 0) = 0;
+ uhd::tune_result_t set_center_freq(double freq, size_t chan){
+ return set_center_freq(uhd::tune_request_t(freq), chan);
+ }
/*!
* Get the tunable frequency range.
+ * \param chan the channel index 0 to N-1
* \return the frequency range in Hz
*/
virtual uhd::freq_range_t get_freq_range(size_t chan = 0) = 0;
@@ -77,17 +93,20 @@ public:
/*!
* Set the gain for the dboard.
* \param gain the gain in dB
+ * \param chan the channel index 0 to N-1
*/
virtual void set_gain(float gain, 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
*/
virtual float get_gain(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
*/
virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0;
@@ -95,22 +114,32 @@ public:
/*!
* Set the antenna to use.
* \param ant the antenna string
+ * \param chan the channel index 0 to N-1
*/
virtual void set_antenna(const std::string &ant, size_t chan = 0) = 0;
/*!
* Get the antenna in use.
+ * \param chan the channel index 0 to N-1
* \return the antenna string
*/
virtual std::string get_antenna(size_t chan = 0) = 0;
/*!
* Get a list of possible antennas.
+ * \param chan the channel index 0 to N-1
* \return a vector of antenna strings
*/
virtual std::vector<std::string> get_antennas(size_t chan = 0) = 0;
/*!
+ * Set the subdevice bandpass filter.
+ * \param bandwidth the filter bandwidth in Hz
+ * \param chan the channel index 0 to N-1
+ */
+ virtual void set_bandwidth(double bandwidth, size_t chan = 0) = 0;
+
+ /*!
* Set the clock configuration.
* \param clock_config the new configuration
*/