diff options
| author | Josh Blum <josh@joshknows.com> | 2013-08-23 15:18:50 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2013-08-23 15:18:50 -0700 |
| commit | c099f2b54fd32215efb3de84f4e857d2d4ce2368 (patch) | |
| tree | 4c9641419555b669fe3846283b2407eb966213fe | |
| parent | 186b25c3cc7065729cdb110b954454f6c1e0e83b (diff) | |
| parent | f8b677183937d565045939061cbd57202e388e50 (diff) | |
| download | uhd-c099f2b54fd32215efb3de84f4e857d2d4ce2368.tar.gz uhd-c099f2b54fd32215efb3de84f4e857d2d4ce2368.tar.bz2 uhd-c099f2b54fd32215efb3de84f4e857d2d4ce2368.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 2e83823ba..d60f0e60c 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -441,6 +441,10 @@ public: /*! * Get the RX center frequency range. + * This range includes the overall tunable range of the RX chain, + * including frontend chain and digital down conversion chain. + * This tunable limit does not include the baseband bandwidth; + * users should assume that the actual range is +/- samp_rate/2. * \param chan the channel index 0 to N-1 * \return a frequency range object */ @@ -694,6 +698,10 @@ public: /*! * Get the TX center frequency range. + * This range includes the overall tunable range of the TX chain, + * including frontend chain and digital up conversion chain. + * This tunable limit does not include the baseband bandwidth; + * users should assume that the actual range is +/- samp_rate/2. * \param chan the channel index 0 to N-1 * \return a frequency range object */ diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index a39d5d085..26ce1ccdd 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -81,8 +81,8 @@ static meta_range_t make_overall_tune_range( meta_range_t range; BOOST_FOREACH(const range_t &sub_range, fe_range){ range.push_back(range_t( - sub_range.start() + std::max(dsp_range.start(), -bw), - sub_range.stop() + std::min(dsp_range.stop(), bw), + sub_range.start() + std::max(dsp_range.start(), -bw/2), + sub_range.stop() + std::min(dsp_range.stop(), bw/2), dsp_range.step() )); } |